Dodana ovisnost o ipcalc i carnet-tools-cn, popravak postinsta

[fail2ban-cn.git] / debian / postinst

diff --git a/debian/postinst b/debian/postinst
index 86ef053..a669349 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,34 +1,10 @@
 #!/bin/sh
-# postinst script for bind9-cn
-#
-# see: dh_installdeb(1)
 
 set -e
-[ "$CARNET_SCRIPT_DEBUG" ] && set -vx
+[ "$1" = "configure" ] || exit 0
+[ "$DEBIAN_SCRIPT_DEBUG" ] && set -vx
 
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-
-case "$1" in
-    configure|reconfigure)
-      # continue below
-    ;;
-
-    *)
-        exit 0
-    ;;
-esac
-
-# import CN-functions
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 CONF="/etc/fail2ban/jail.conf"
@@ -72,12 +48,19 @@ if [ -e "$CONF" ]; then
     # 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
+    IGNOREIP=$(grep '^ignoreip' "$CONF" || true)
+    if grep -q '^ignoreip' "$CONF"; then
+        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
+    elif grep -q '^#ignoreip' "$CONF"; then
+        echo "CN: Enabling local IP ranges exclusion..."
+        cp_check_and_sed '^#ignoreip' \
+            "s;^#ignoreip.*$;ignoreip = $NETADDR;g" "$CONF" || true
+   fi
 fi
 
 # restart the services