From 6e7b4a8221e0118a176f0c0351cb6eac7d8d2b76 Mon Sep 17 00:00:00 2001 From: Alexander Koeppe Date: Fri, 8 Apr 2016 23:20:43 +0200 Subject: [PATCH] use same naming for iptables chains for v4 and v6 --- config/action.d/iptables-allports.conf | 18 ++++++------- config/action.d/iptables-multiport-log.conf | 28 ++++++++++----------- config/action.d/iptables-multiport.conf | 18 ++++++------- config/action.d/iptables-new.conf | 18 ++++++------- config/action.d/iptables.conf | 18 ++++++------- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/config/action.d/iptables-allports.conf b/config/action.d/iptables-allports.conf index a9ffa9ae..7484781a 100644 --- a/config/action.d/iptables-allports.conf +++ b/config/action.d/iptables-allports.conf @@ -23,9 +23,9 @@ actionstart = -N f2b- -A f2b- -j -I -p -j f2b- -actionstart6 = -N f2b-6 - -A f2b-6 -j - -I -p -j f2b-6 +actionstart6 = -N f2b- + -A f2b- -j + -I -p -j f2b- # Option: actionstop # Notes.: command executed once at the end of Fail2Ban @@ -35,16 +35,16 @@ actionstop = -D -p -j f2b- -F f2b- -X f2b- -actionstop6 = -D -p -j f2b-6 - -F f2b-6 - -X f2b-6 +actionstop6 = -D -p -j f2b- + -F f2b- + -X f2b- # Option: actioncheck # Notes.: command executed once before each actionban command # Values: CMD # actioncheck = -n -L | grep -q 'f2b-[ \t]' -actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' +actioncheck6 = -n -L | grep -q 'f2b-[ \t]' # Option: actionban # Notes.: command executed when banning an IP. Take care that the @@ -53,7 +53,7 @@ actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' # Values: CMD # actionban = -I f2b- 1 -s -j -actionban6 = -I f2b-6 1 -s -j +actionban6 = -I f2b- 1 -s -j # Option: actionunban # Notes.: command executed when unbanning an IP. Take care that the @@ -62,7 +62,7 @@ actionban6 = -I f2b-6 1 -s -j # Values: CMD # actionunban = -D f2b- -s -j -actionunban6 = -D f2b-6 -s -j +actionunban6 = -D f2b- -s -j [Init] diff --git a/config/action.d/iptables-multiport-log.conf b/config/action.d/iptables-multiport-log.conf index f98c6884..df8b4d14 100644 --- a/config/action.d/iptables-multiport-log.conf +++ b/config/action.d/iptables-multiport-log.conf @@ -28,12 +28,12 @@ actionstart = -N f2b- -I f2b--log -j LOG --log-prefix "$(expr f2b- : '\(.\{1,23\}\)'):DROP " --log-level warning -m limit --limit 6/m --limit-burst 2 -A f2b--log -j -actionstart6 = -N f2b-6 - -A f2b-6 -j - -I 1 -p -m multiport --dports -j f2b-6 - -N f2b-6-log - -I f2b-6-log -j LOG --log-prefix "$(expr f2b-6 : '\(.\{1,23\}\)'):DROP " --log-level warning -m limit --limit 6/m --limit-burst 2 - -A f2b-6-log -j +actionstart6 = -N f2b- + -A f2b- -j + -I 1 -p -m multiport --dports -j f2b- + -N f2b--log + -I f2b--log -j LOG --log-prefix "$(expr f2b- : '\(.\{1,23\}\)'):DROP " --log-level warning -m limit --limit 6/m --limit-burst 2 + -A f2b--log -j # Option: actionstop # Notes.: command executed once at the end of Fail2Ban @@ -45,18 +45,18 @@ actionstop = -D -p -m multiport --dports -j -X f2b- -X f2b--log -actionstop6 = -D -p -m multiport --dports -j f2b-6 - -F f2b-6 - -F f2b-6-log - -X f2b-6 - -X f2b-6-log +actionstop6 = -D -p -m multiport --dports -j f2b- + -F f2b- + -F f2b--log + -X f2b- + -X f2b--log # Option: actioncheck # Notes.: command executed once before each actionban command # Values: CMD # actioncheck = -n -L f2b--log >/dev/null -actioncheck6 = -n -L f2b-6-log >/dev/null +actioncheck6 = -n -L f2b--log >/dev/null # Option: actionban # Notes.: command executed when banning an IP. Take care that the @@ -65,7 +65,7 @@ actioncheck6 = -n -L f2b-6-log >/dev/null # Values: CMD # actionban = -I f2b- 1 -s -j f2b--log -actionban6 = -I f2b-6 1 -s -j f2b-6-log +actionban6 = -I f2b- 1 -s -j f2b--log # Option: actionunban # Notes.: command executed when unbanning an IP. Take care that the @@ -74,7 +74,7 @@ actionban6 = -I f2b-6 1 -s -j f2b-6-log # Values: CMD # actionunban = -D f2b- -s -j f2b--log -actionunban6 = -D f2b-6 -s -j f2b-6-log +actionunban6 = -D f2b- -s -j f2b--log [Init] diff --git a/config/action.d/iptables-multiport.conf b/config/action.d/iptables-multiport.conf index 5a5bd746..c5f34bca 100644 --- a/config/action.d/iptables-multiport.conf +++ b/config/action.d/iptables-multiport.conf @@ -20,9 +20,9 @@ actionstart = -N f2b- -A f2b- -j -I -p -m multiport --dports -j f2b- -actionstart6 = -N f2b-6 - -A f2b-6 -j - -I -p -m multiport --dports -j f2b-6 +actionstart6 = -N f2b- + -A f2b- -j + -I -p -m multiport --dports -j f2b- # Option: actionstop # Notes.: command executed once at the end of Fail2Ban @@ -32,16 +32,16 @@ actionstop = -D -p -m multiport --dports -j -F f2b- -X f2b- -actionstop6 = -D -p -m multiport --dports -j f2b-6 - -F f2b-6 - -X f2b-6 +actionstop6 = -D -p -m multiport --dports -j f2b- + -F f2b- + -X f2b- # Option: actioncheck # Notes.: command executed once before each actionban command # Values: CMD # actioncheck = -n -L | grep -q 'f2b-[ \t]' -actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' +actioncheck6 = -n -L | grep -q 'f2b-[ \t]' # Option: actionban # Notes.: command executed when banning an IP. Take care that the @@ -50,7 +50,7 @@ actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' # Values: CMD # actionban = -I f2b- 1 -s -j -actionban6 = -I f2b-6 1 -s -j +actionban6 = -I f2b- 1 -s -j # Option: actionunban # Notes.: command executed when unbanning an IP. Take care that the @@ -59,7 +59,7 @@ actionban6 = -I f2b-6 1 -s -j # Values: CMD # actionunban = -D f2b- -s -j -actionunban6 = -D f2b-6 -s -j +actionunban6 = -D f2b- -s -j [Init] diff --git a/config/action.d/iptables-new.conf b/config/action.d/iptables-new.conf index 89e58a50..27d22706 100644 --- a/config/action.d/iptables-new.conf +++ b/config/action.d/iptables-new.conf @@ -22,9 +22,9 @@ actionstart = -N f2b- -A f2b- -j -I -m state --state NEW -p --dport -j f2b- -actionstart6 = -N f2b-6 - -A f2b-6 -j - -I -m state --state NEW -p --dport -j f2b-6 +actionstart6 = -N f2b- + -A f2b- -j + -I -m state --state NEW -p --dport -j f2b- # Option: actionstop # Notes.: command executed once at the end of Fail2Ban @@ -34,16 +34,16 @@ actionstop = -D -m state --state NEW -p --dport

-F f2b- -X f2b- -actionstop6 = -D -m state --state NEW -p --dport -j f2b-6 - -F f2b-6 - -X f2b-6 +actionstop6 = -D -m state --state NEW -p --dport -j f2b- + -F f2b- + -X f2b- # Option: actioncheck # Notes.: command executed once before each actionban command # Values: CMD # actioncheck = -n -L | grep -q 'f2b-[ \t]' -actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' +actioncheck6 = -n -L | grep -q 'f2b-[ \t]' # Option: actionban # Notes.: command executed when banning an IP. Take care that the @@ -52,7 +52,7 @@ actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' # Values: CMD # actionban = -I f2b- 1 -s -j -actionban6 = -I f2b-6 1 -s -j +actionban6 = -I f2b- 1 -s -j # Option: actionunban # Notes.: command executed when unbanning an IP. Take care that the @@ -61,7 +61,7 @@ actionban6 = -I f2b-6 1 -s -j # Values: CMD # actionunban = -D f2b- -s -j -actionunban6 = -D f2b-6 -s -j +actionunban6 = -D f2b- -s -j [Init] diff --git a/config/action.d/iptables.conf b/config/action.d/iptables.conf index 9ef8f1a1..828a62c1 100644 --- a/config/action.d/iptables.conf +++ b/config/action.d/iptables.conf @@ -20,9 +20,9 @@ actionstart = -N f2b- -A f2b- -j -I -p --dport -j f2b- -actionstart6 = -N f2b-6 - -A f2b-6 -j - -I -p --dport -j f2b-6 +actionstart6 = -N f2b- + -A f2b- -j + -I -p --dport -j f2b- # Option: actionstop # Notes.: command executed once at the end of Fail2Ban @@ -32,16 +32,16 @@ actionstop = -D -p --dport -j f2b- -F f2b- -X f2b- -actionstop6 = -D -p --dport -j f2b-6 - -F f2b-6 - -X f2b-6 +actionstop6 = -D -p --dport -j f2b- + -F f2b- + -X f2b- # Option: actioncheck # Notes.: command executed once before each actionban command # Values: CMD # actioncheck = -n -L | grep -q 'f2b-[ \t]' -actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' +actioncheck6 = -n -L | grep -q 'f2b-[ \t]' # Option: actionban # Notes.: command executed when banning an IP. Take care that the @@ -50,7 +50,7 @@ actioncheck6 = -n -L | grep -q 'f2b-6[ \t]' # Values: CMD # actionban = -I f2b- 1 -s -j -actionban6 = -I f2b-6 1 -s -j +actionban6 = -I f2b- 1 -s -j # Option: actionunban # Notes.: command executed when unbanning an IP. Take care that the @@ -59,7 +59,7 @@ actionban6 = -I f2b-6 1 -s -j # Values: CMD # actionunban = -D f2b- -s -j -actionunban6 = -D f2b-6 -s -j +actionunban6 = -D f2b- -s -j [Init]