X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=cbd1e674dada34789a31c75c3c966a3c0582c346;hb=7ace5424b7711c90d37117b174754cea041dc677;hp=ac489146680a31769eddb4a53aac9f053fad83b5;hpb=ce0d4ab7aeae0f232197273c4fcddc715a7f099e;p=fail2ban-cn.git

diff --git a/debian/postinst b/debian/postinst
index ac48914..cbd1e67 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -30,43 +30,28 @@ 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\s=\sfalse/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 -a "$CONF" "$CONF.$$"
-    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
 fi
 
 # restart the services
-if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-	invoke-rc.d fail2ban restart || exit $?
-else
-	/etc/init.d/fail2ban restart || exit $?
-fi
+service fail2ban restart || exit $?
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.