diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/25Actions b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/25Actions index ba3b3db..1d551ae 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/25Actions +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/25Actions @@ -1,7 +1,7 @@ -action = smeserver[port="", protocol=] { +our $action = "action = smeserver[port=\"\", protocol=, bantime=]"; if (($fail2ban{'Mail'} || 'disabled') eq 'enabled'){ my $dest = $fail2ban{'MailRecipient'} || 'root'; - $OUT .= " sendmail[name=, dest=$dest]\n"; + $action .= " sendmail[name=, dest=$dest]\n"; } } 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 4525be4..ebac9d6 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh @@ -11,6 +11,7 @@ filter = sshd port = $port protocol = tcp name = ssh +$action logpath = /var/log/sshd/current EOF } 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 561a3b0..85e985c 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot @@ -17,6 +17,7 @@ filter = dovecot port = $port protocol = tcp name = dovecot +$action logpath = /var/log/dovecot/current 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 139577c..ad2fe01 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service25httpd +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service25httpd @@ -15,6 +15,7 @@ filter = apache-overflows port = $port protocol = tcp name = apache-overflows +$action logpath = /var/log/httpd/error_log [http-noscript] @@ -23,6 +24,7 @@ filter = apache-noscript port = $port protocol = tcp name = apache-noscript +$action logpath = /var/log/httpd/error_log [http-scan] @@ -31,6 +33,7 @@ filter = apache-scan port = $port protocol = tcp name = apache-scan +$action logpath = /var/log/httpd/error_log [http-auth] @@ -39,6 +42,7 @@ filter = apache-auth port = $port protocol = tcp name = apache-auth +$action logpath = /var/log/httpd/error_log EOF 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 f41cab8..3794ef4 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service30pam +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service30pam @@ -2,6 +2,7 @@ [pam-generic] enabled = true filter = pam-generic -action = smeserver[] +name = = pam-generic +$action logpath = /var/log/secure 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 43a0642..774366a 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service35SOGo +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service35SOGo @@ -15,6 +15,7 @@ filter = sogo port = $port protocol = tcp name = sogo +$action logpath = /var/log/sogo/sogo.log EOF diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/90Recidive b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/90Recidive index 15002ca..c8504f2 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/90Recidive +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/90Recidive @@ -3,8 +3,8 @@ enabled = true filter = recidive logpath = /var/log/fail2ban/daemon.log -action = smeserver[name=recidive] bantime = 604800 findtime = 86400 maxretry = 5 backend = polling +$action