X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;ds=sidebyside;f=debian%2Fpostinst;h=4adc7bc95a511ba9b3bb3c48f09107757f6cdb18;hb=afa639f1215d720cbef34b3055871245548ac705;hp=ea2b57b336796407953fe0f07ed2aef858ca37cf;hpb=724df8088b10f0957457b152fe4adfe36d63cdbb;p=fail2ban-cn.git

diff --git a/debian/postinst b/debian/postinst
index ea2b57b..4adc7bc 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -30,31 +30,21 @@ esac
 # import CN-functions
 . /usr/share/carnet-tools/functions.sh
 
-CONF=/etc/fail2ban/jail.conf
+CONF="/etc/fail2ban/jail.conf"
 
 if [ -e "$CONF" ]; then
     # enable ssh, pam-generic, sasl, proftpd and vsftpd service
-    perl -ne 'if (/\[(ssh|pam-generic|sasl|proftpd|vsftpd)\]/ .. /enabled/) { $_ =~ s/enabled = false/enabled = true/gi }; print $_' "$CONF" > "$CONF.$$" && \
+    echo "CN: Enabling SSH, PAM-generic, SASL, ProFTPD, vsftpd and Dovecot support..."
+    perl -ne 'if (/^\[(ssh|pam-generic|sasl|proftpd|vsftpd|dovecot)\]/ .. /^enabled/) { $_ =~ s/^enabled\s+=\s+false/enabled	= true/gi }; print $_' "$CONF" > "$CONF.$$" && \
         cp_mv "$CONF.$$" "$CONF"
     rm -f "$CONF.$$"
 
-    # enable dovecot service
-    cp-update fail2ban-cn "$CONF.$$" <<EOF
-[dovecot]
-
-enabled     = true
-port        = 110,143
-protocol    = tcp
-filter      = dovecot
-logpath     = /var/log/mail.log
-EOF
-    cp_mv "$CONF.$$" "$CONF"
-
     # add network address and class if needed
     cp_get_netaddr || true
     NETADDR="$RET"
     IGNOREIP=$(grep '^ignoreip' "$CONF")
     if ! echo "$IGNOREIP" | grep -q "$NETADDR"; then
+       echo "CN: Enabling local IP ranges exclusion..."
        cp_check_and_sed '^ignoreip' \
             "s;^\(ignoreip.*\)$;\1 $NETADDR;g" "$CONF" || true
     fi