From 402262d7d4bcfe590c741cf625f58d44cbc6a8ce Mon Sep 17 00:00:00 2001
From: Marek Isalski <maz@hexes.tenebrae.faelix.org>
Date: Sun, 3 Jan 2021 19:24:05 +0000
Subject: [PATCH] goodbye oldschool netflow iptables rule

---
 bcp38.iptables.v4 | 4 ++--
 bcp38.iptables.v6 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bcp38.iptables.v4 b/bcp38.iptables.v4
index 2fe7f18..db0bde6 100644
--- a/bcp38.iptables.v4
+++ b/bcp38.iptables.v4
@@ -27,13 +27,13 @@ COMMIT
 *mangle
 :PREROUTING ACCEPT [0:0]
 {% for iface_name, iface_data in pillar['netbox']['interfaces'].items() %}{% if salt['pillar.get']('interfaces:'+iface_name+':netflow') %}
--A PREROUTING -i {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 {% if salt['grains.get']('kernelrelease','') in ["4.19.52-amd64-vyos","4.19.84-amd64-vyos","4.19.106-amd64-vyos"] %}--nflog-range 64{% else %}--nflog-size 64{% endif %} --nflog-threshold 64
+-A PREROUTING -i {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 --nflog-size 64 --nflog-threshold 64
 {% endif %}{% endfor %}
 :INPUT ACCEPT [0:0]
 :FORWARD ACCEPT [0:0]
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 {% for iface_name, iface_data in pillar['netbox']['interfaces'].items() %}{% if salt['pillar.get']('interfaces:'+iface_name+':netflow') %}
--A POSTROUTING -o {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 {% if salt['grains.get']('kernelrelease','') in ["4.19.52-amd64-vyos","4.19.84-amd64-vyos","4.19.106-amd64-vyos"] %}--nflog-range 64{% else %}--nflog-size 64{% endif %} --nflog-threshold 64
+-A POSTROUTING -o {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 --nflog-size 64 --nflog-threshold 64
 {% endif %}{% endfor %}
 COMMIT
diff --git a/bcp38.iptables.v6 b/bcp38.iptables.v6
index 015d0c0..3486f20 100644
--- a/bcp38.iptables.v6
+++ b/bcp38.iptables.v6
@@ -27,13 +27,13 @@ COMMIT
 *mangle
 :PREROUTING ACCEPT [0:0]
 {% for iface_name, iface_data in pillar['netbox']['interfaces'].items() %}{% if salt['pillar.get']('interfaces:'+iface_name+':netflow') %}
--A PREROUTING -i {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 {% if salt['grains.get']('kernelrelease','') in ["4.19.52-amd64-vyos","4.19.84-amd64-vyos","4.19.106-amd64-vyos"] %}--nflog-range 64{% else %}--nflog-size 64{% endif %} --nflog-threshold 64
+-A PREROUTING -i {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 --nflog-size 64 --nflog-threshold 64
 {% endif %}{% endfor %}
 :INPUT ACCEPT [0:0]
 :FORWARD ACCEPT [0:0]
 :OUTPUT ACCEPT [0:0]
 :POSTROUTING ACCEPT [0:0]
 {% for iface_name, iface_data in pillar['netbox']['interfaces'].items() %}{% if salt['pillar.get']('interfaces:'+iface_name+':netflow') %}
--A POSTROUTING -o {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 {% if salt['grains.get']('kernelrelease','') in ["4.19.52-amd64-vyos","4.19.84-amd64-vyos","4.19.106-amd64-vyos"] %}--nflog-range 64{% else %}--nflog-size 64{% endif %} --nflog-threshold 64
+-A POSTROUTING -o {{ iface_name }} -m statistic --mode nth --packet 1 --every {{ salt['pillar.get']('netflow:sampling-rate',64) }} -j NFLOG --nflog-group 2 --nflog-size 64 --nflog-threshold 64
 {% endif %}{% endfor %}
 COMMIT