diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh index cdf8491..af59d34 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh @@ -9,7 +9,7 @@ $OUT .=<<"EOF"; enabled = true filter = sshd logpath = /var/log/sshd/current -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=SSH,dest=$maildest]\n" diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot index a0f7b94..251de83 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot @@ -15,7 +15,7 @@ $OUT .=<<"EOF"; enabled = true filter = dovecot logpath = /var/log/dovecot/current -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=Dovecot,dest=$maildest]\n" diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service20qpsmtpd b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service20qpsmtpd index 5959c91..e24eaa3 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service20qpsmtpd +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service20qpsmtpd @@ -16,7 +16,7 @@ $OUT .=<<"EOF"; enabled = true filter = qpsmtpd logpath = /var/log/*qpsmtpd/current -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] maxretry = $max EOF diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service25httpd b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service25httpd index 6c832cd..f41257b 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service25httpd +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service25httpd @@ -13,7 +13,7 @@ $OUT .=<<"EOF"; enabled = true filter = apache-overflows logpath = /var/log/httpd/error_log -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=\"Apache (overflows)\",dest=$maildest]\n" @@ -25,7 +25,7 @@ $OUT .=<<"EOF"; enabled = true filter = apache-noscript logpath = /var/log/httpd/error_log -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=\"Apache (noscript)\",dest=$maildest]\n" @@ -37,7 +37,7 @@ $OUT .=<<"EOF"; enabled = true filter = apache-scan logpath = /var/log/httpd/error_log -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=\"Apache (scan)\",dest=$maildest]\n" @@ -49,7 +49,7 @@ $OUT .=<<"EOF"; enabled = true filter = apache-auth logpath = /var/log/httpd/error_log -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=\"Apache (auth)\",dest=$maildest]\n" diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service30pam b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service30pam index faabc54..6fdf96b 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service30pam +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service30pam @@ -3,7 +3,7 @@ enabled = true filter = pam-generic logpath = /var/log/secure -action = smeserver[bantime={"$bantime"}] +action = smeserver-iptables[bantime={"$bantime"}] { $OUT .= " smeserver-sendmail[name=SSH,dest=$maildest]\n" if ($mail eq 'enabled'); diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service35SOGo b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service35SOGo index acb62f0..72c4106 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service35SOGo +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service35SOGo @@ -13,7 +13,7 @@ $OUT .=<<"EOF"; enabled = true filter = sogo logpath = /var/log/sogo/sogo.log -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=\"SOGo\",dest=$maildest]\n" diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service40LemonLDAPNG b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service40LemonLDAPNG index d3e1c3a..eee554b 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service40LemonLDAPNG +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service40LemonLDAPNG @@ -13,7 +13,7 @@ $OUT .=<<"EOF"; enabled = true filter = lemonldap-ng logpath = /var/log/messages -action = smeserver[port="$port",protocol=tcp,bantime=$bantime] +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF $OUT .= " smeserver-sendmail[name=\"LemonLDAP::NG\",dest=$maildest]\n" diff --git a/root/etc/fail2ban/action.d/smeserver.conf b/root/etc/fail2ban/action.d/smeserver-iptables.conf similarity index 100% rename from root/etc/fail2ban/action.d/smeserver.conf rename to root/etc/fail2ban/action.d/smeserver-iptables.conf