X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=mod-security-cn.git;a=blobdiff_plain;f=debian%2Fprerm;fp=debian%2Fprerm;h=379b3839948036227b1b7bb40e3b92b9497453b9;hp=bd99613f7c7622004ef49e6dbe9c88ed56832d4c;hb=d6d471ca8237b76920e6c78385214ffe26ce6dc6;hpb=ec48dc950b35445e2c742e644d62e4fc5425705a

diff --git a/debian/prerm b/debian/prerm
index bd99613..379b383 100644
--- a/debian/prerm
+++ b/debian/prerm
@@ -2,6 +2,12 @@
 
 set -e
 
+PKG=mod-security-cn
+
+MODSECCONF=/etc/apache2/mod-security/$PKG.conf
+MODSECRBL=/etc/apache2/mod-security/rbl_lookup.conf
+MODSECLNK=/etc/apache2/conf-available/security2-cn.conf
+
 # chk_conf_tag ()
 #
 #   Check if configuration file has CARNet package info lines.
@@ -23,67 +29,41 @@ chk_conf_tag () {
     fi
 }
 
+if [ -e /usr/share/apache2/apache2-maintscript-helper ]; then
+    . /usr/share/apache2/apache2-maintscript-helper
 
-case "$1" in
-    remove|deconfigure)
-
-        # Include CARNet functions.
-        . /usr/share/carnet-tools/functions.sh
-
-        PKG="mod-security-cn"
-        A2DIR="/etc/apache2"
-        CONFDIR="$A2DIR/conf.d"
-        MODSECDIR="$A2DIR/mod-security"
-        MODSECCONF="$MODSECDIR/mod-security-cn.conf"
-        MODSECRBL="$MODSECDIR/rbl_lookup.conf"
-        MODSECLNK="$CONFDIR/$(basename $MODSECCONF)"
-
-        need_restart=0
-
-
-        # Disable ModSecurity configuration.
-        chk_conf_tag "$MODSECCONF"
-        if [ $RET -eq 0 ]; then
-            if [ -e "$MODSECLNK" ]; then
-                cp_echo "CN: Disabling ModSecurity configuration."
-                rm -f "$MODSECLNK"
-                need_restart=1
-            fi
+    modsecurity_enable() {
+        chk_conf_tag "$MODSECLNK"
+        if [ $RET -ne 2 ]; then
+            echo "CN: Disabling $PKG configuration for Apache2."
+            return 0
         fi
+        return 1
+    }
+else
+    echo "CN: Could not load Apache 2.4 maintainer script helper."
+
+    modsecurity_enable() {
+        return 1
+    }
+fi
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+    # Disable ModSecurity configuration.
+    if modsecurity_enable; then
+        apache2_invoke disconf security2-cn
+        rm -f "$MODSECLNK"
+    fi
 
-        # Remove configuration files generated by this CARNet package.
-        for file in "$MODSECCONF" "$MODSECRBL"; do
-            chk_conf_tag "$file"
-            if [ $RET -eq 0 ]; then
-                cp_echo "CN: Removing configuration file $file"
-                rm -f $file
-                need_restart=1
-            fi
-        done
-
-        # Restart Apache2 web server.
-        if [ $need_restart -eq 1 ]; then
-            if apache2ctl configtest 2>/dev/null; then
-                invoke-rc.d apache2 force-reload || true
-            else
-                # Something is broken.
-                cp_echo "CN: Your Apache2 configuration seem to be broken."
-                cp_echo "CN: Please, check the service configuration!"
-            fi
+    # Remove configuration files generated by this CARNet package.
+    for mfile in "$MODSECCONF" "$MODSECRBL"; do
+        chk_conf_tag "$mfile"
+        if [ $RET -eq 0 ]; then
+            echo "CN: Removing configuration file $mfile"
+            rm -f "$mfile"
         fi
-
-        # Mail root
-        cp_mail "$PKG"
-
-        echo
-        ;;
-    upgrade|failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \$1'" >&2
-        exit 0
-        ;;
-esac
+    done
+fi
 
 #DEBHELPER#