X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=7a3def15ec8e571bad855d7fd39dce2f951f66be;hb=db5e5c899f273c71fd7b489453179eb6232694f0;hp=f08d307fd7e85f8a58328c1f471d96d0b1051445;hpb=ad2a31e07695cd2fc73df76e478d7ea2384095d9;p=monit-cn.git

diff --git a/debian/postinst b/debian/postinst
index f08d307..7a3def1 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -56,6 +56,11 @@ if grep -q '@localhost' /etc/monit/monitrc; then
         /etc/monit/monitrc || true
 fi
 
+# fix "but not on { changed } bug in monitrc
+cp_check_and_sed '^set alert [^[:space:]]*@[^[:space:]]* (but )?not on { changed }$' \
+    's/^set alert \([^[:space:]]*@[^[:space:]]*\) .*$/set alert \1 only on { uid, gid, size, nonexist, data, icmp, instance, invalid, exec, timeout, resource, checksum, match, timestamp, connection, permission }/g' \
+    /etc/monit/monitrc || true
+
 # if alert for "changed" is enabled, disable it ASAP
 # we're waiting for "but not on { changed }" to enter in official
 # package...
@@ -68,20 +73,20 @@ update-monit.d || true
 
 # disable monit startup
 cp_check_and_sed '^startup[[:space:]]*=[[:space:]]*1' \
-    '^startup[[:space:]]*=.*/startup=0/g' /etc/default/monit || true
+    's/^startup[[:space:]]*=.*/startup=0/g' /etc/default/monit || true
 
 # systemv part
-echo "CN: Disabling monit SystemV script"
-if [ -x "/etc/init.d/monit" ]; then
-    update-rc.d -f monit remove >/dev/null 2>&1
-    if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-        invoke-rc.d monit stop || true
-    else
-        /etc/init.d/monit stop || true
+if ! grep -q 'CARNet package monit-cn' /etc/init.d/monit; then
+    echo "CN: Disabling monit SystemV script"
+    if [ -x "/etc/init.d/monit" ]; then
+        update-rc.d -f monit remove >/dev/null 2>&1
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+            invoke-rc.d monit stop || true
+        else
+            /etc/init.d/monit stop || true
+        fi
     fi
-fi
-if [ -e "/etc/init.d/monit" ]; then
-    if ! grep -q 'CARNet package monit-cn' /etc/init.d/monit; then
+    if [ -e "/etc/init.d/monit" ]; then
         # shebang
         head -n1 /etc/init.d/monit > /etc/init.d/monit.$$
         # middle part
@@ -111,7 +116,7 @@ fi
 
 # reload init, since we have new configuration
 echo "CN: (Re)starting monit service, please check /var/log/daemon.log"
-pkill -9 -f /usr/sbin/monit || true
+pkill -9 -f '/usr/sbin/monit$' || true
 kill -HUP 1
 
 # dh_installdeb will replace this with shell code automatically