diff --git a/MANIFEST b/MANIFEST index 364c0b08..999a6a95 100644 --- a/MANIFEST +++ b/MANIFEST @@ -98,6 +98,7 @@ config/filter.d/lighttpd-auth.conf config/filter.d/recidive.conf config/filter.d/roundcube-auth.conf config/action.d/dummy.conf +config/action.d/iptables-blocktype.conf config/action.d/iptables-ipset-proto4.conf config/action.d/iptables-ipset-proto6.conf config/action.d/iptables-xt_recent-echo.conf diff --git a/config/action.d/iptables-allports.conf b/config/action.d/iptables-allports.conf index 66ad0178..17c75dda 100644 --- a/config/action.d/iptables-allports.conf +++ b/config/action.d/iptables-allports.conf @@ -7,6 +7,11 @@ # $Revision$ # +[INCLUDES] + +before = iptables-blocktype.conf + + [Definition] # Option: actionstart @@ -64,10 +69,3 @@ protocol = tcp # added # Values: STRING Default: INPUT chain = INPUT - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables-blocktype.conf b/config/action.d/iptables-blocktype.conf new file mode 100644 index 00000000..c505e49c --- /dev/null +++ b/config/action.d/iptables-blocktype.conf @@ -0,0 +1,22 @@ +# Fail2Ban configuration file +# +# Author: Daniel Black +# +# This is a included configuration file and includes the defination for the blocktype +# used in all iptables based actions by default. +# +# The user can override the default in iptables-blocktype.local + +[INCLUDES] + +after = iptables-blocktype.local + +[Init] + +# Option: blocktype +# Note: This is what the action does with rules. This can be any jump target +# as per the iptables man page (section 8). Common values are DROP +# REJECT, REJECT --reject-with icmp-port-unreachable +# Values: STRING +blocktype = REJECT --reject-with icmp-port-unreachable + diff --git a/config/action.d/iptables-ipset-proto4.conf b/config/action.d/iptables-ipset-proto4.conf index 0999bca0..3ed778f9 100644 --- a/config/action.d/iptables-ipset-proto4.conf +++ b/config/action.d/iptables-ipset-proto4.conf @@ -18,6 +18,10 @@ # apt-get install ipset xtables-addons-source # module-assistant auto-install xtables-addons +[INCLUDES] + +before = iptables-blocktype.conf + [Definition] # Option: actionstart @@ -68,10 +72,3 @@ port = ssh # Values: [ tcp | udp | icmp | all ] Default: tcp # protocol = tcp - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables-ipset-proto6.conf b/config/action.d/iptables-ipset-proto6.conf index 95ff27c9..3cf9b140 100644 --- a/config/action.d/iptables-ipset-proto6.conf +++ b/config/action.d/iptables-ipset-proto6.conf @@ -18,6 +18,11 @@ # apt-get install ipset xtables-addons-source # module-assistant auto-install xtables-addons +[INCLUDES] + +before = iptables-blocktype.conf + + [Definition] # Option: actionstart @@ -74,11 +79,3 @@ protocol = tcp # Values: [ NUM ] Default: 600 bantime = 600 - - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables-multiport-log.conf b/config/action.d/iptables-multiport-log.conf index 5ae93861..add57338 100644 --- a/config/action.d/iptables-multiport-log.conf +++ b/config/action.d/iptables-multiport-log.conf @@ -10,6 +10,10 @@ # $Revision$ # +[INCLUDES] + +before = iptables-blocktype.conf + [Definition] # Option: actionstart @@ -78,10 +82,3 @@ protocol = tcp # added # Values: STRING Default: INPUT chain = INPUT - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables-multiport.conf b/config/action.d/iptables-multiport.conf index b7827451..e5ae97f0 100644 --- a/config/action.d/iptables-multiport.conf +++ b/config/action.d/iptables-multiport.conf @@ -5,6 +5,10 @@ # $Revision$ # +[INCLUDES] + +before = iptables-blocktype.conf + [Definition] # Option: actionstart @@ -68,10 +72,3 @@ protocol = tcp # added # Values: STRING Default: INPUT chain = INPUT - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables-new.conf b/config/action.d/iptables-new.conf index f5467ee2..c8664a22 100644 --- a/config/action.d/iptables-new.conf +++ b/config/action.d/iptables-new.conf @@ -7,6 +7,11 @@ # $Revision$ # +[INCLUDES] + +before = iptables-blocktype.conf + + [Definition] # Option: actionstart @@ -70,10 +75,3 @@ protocol = tcp # added # Values: STRING Default: INPUT chain = INPUT - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables-xt_recent-echo.conf b/config/action.d/iptables-xt_recent-echo.conf index e7d7182f..1094839d 100644 --- a/config/action.d/iptables-xt_recent-echo.conf +++ b/config/action.d/iptables-xt_recent-echo.conf @@ -5,6 +5,11 @@ # $Revision: 1 $ # +[INCLUDES] + +before = iptables-blocktype.conf + + [Definition] # Option: actionstart @@ -70,10 +75,3 @@ name = default # Values: [ tcp | udp | icmp | all ] Default: tcp # protocol = tcp - -# Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable diff --git a/config/action.d/iptables.conf b/config/action.d/iptables.conf index be4b880c..2368cbdc 100644 --- a/config/action.d/iptables.conf +++ b/config/action.d/iptables.conf @@ -5,6 +5,10 @@ # $Revision$ # +[INCLUDES] + +before = iptables-blocktype.conf + [Definition] # Option: actionstart @@ -68,11 +72,3 @@ protocol = tcp # added # Values: STRING Default: INPUT chain = INPUT - -Option: blocktype -# Note: This is what the action does with rules. This can be any jump target -# as per the iptables man page (section 8). Common values are DROP -# REJECT, REJECT --reject-with icmp-port-unreachable -# Values: STRING -blocktype = REJECT --reject-with icmp-port-unreachable -