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 af59d34..04c7d13 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service10ssh @@ -12,7 +12,7 @@ logpath = /var/log/sshd/current action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF -$OUT .= " smeserver-sendmail[name=SSH,dest=$maildest]\n" +$OUT .= " smeserver-sendmail[name=\"SSH\",dest=$maildest]\n" if ($mail eq 'enabled'); } 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 251de83..f369b12 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service15dovecot @@ -18,7 +18,7 @@ logpath = /var/log/dovecot/current action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] EOF -$OUT .= " smeserver-sendmail[name=Dovecot,dest=$maildest]\n" +$OUT .= " smeserver-sendmail[name=\"Dovecot\",dest=$maildest]\n" if ($mail eq 'enabled'); } diff --git a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service45ftp b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service45ftp new file mode 100644 index 0000000..da62eef --- /dev/null +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/30Service45ftp @@ -0,0 +1,20 @@ +{ + +my $port = $ftp{'TCPPort'} || '21'; +my $status = $ftp{'status'} || 'disabled'; +return "" if ($status ne 'enabled'); +# add the data channel port +$port .= ',20'; +$OUT .=<<"EOF"; + +[ftp] +enabled = true +filter = proftpd +logpath = /var/log/secure +action = smeserver-iptables[port="$port",protocol=tcp,bantime=$bantime] +EOF + +$OUT .= " smeserver-sendmail[name=\"FTP\",dest=$maildest]\n" + if ($mail eq 'enabled'); + +} 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 c421d27..e7f7e5d 100644 --- a/root/etc/e-smith/templates/etc/fail2ban/jail.conf/90Recidive +++ b/root/etc/e-smith/templates/etc/fail2ban/jail.conf/90Recidive @@ -9,7 +9,7 @@ maxretry = 5 backend = polling action = smeserver[bantime=604800] { -$OUT .= " sendmail[name=Recidive,dest=$maildest]\n" +$OUT .= " sendmail[name=\"Recidive\",dest=$maildest]\n" if ($mail eq 'enabled'); $OUT .= ''; }