X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=25a4a2f4f41a7da0e20e6ef0af33f40284f98821;hb=7c8a71ff7a7e506f220507618f18cdbf1949ebf8;hp=97dd2100cfe28ab13d8a36c496080562055af556;hpb=73983673253277faed06aa536fd3c145faece6fa;p=monit-cn.git

diff --git a/debian/postinst b/debian/postinst
index 97dd210..25a4a2f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for bind9-cn
+# postinst script for monit-cn
 #
 # see: dh_installdeb(1)
 
@@ -34,7 +34,7 @@ esac
 installfile=1
 if [ -e /etc/monit/monitrc ]; then
     lines=$(grep -v '^#' /etc/monit/monitrc | wc -l)
-    if [ $lines -lt 2 ]; then
+    if [ $lines -lt 4 ]; then
         installfile=1
         mv -f /etc/monit/monitrc /etc/monit/monitrc.dpkg-old
     else
@@ -56,16 +56,9 @@ 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...
-cp_check_and_sed '^set alert [^[:space:]]*@[^[:space:]]*$' \
-    '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' \
+# migrate to "but not on { instance }" alerting style
+cp_check_and_sed '^set alert [^[:space:]]*@[^[:space:]]* ' \
+    's/^set alert \([^[:space:]]*@[^[:space:]]*\) .*$/set alert \1 but not on { instance }/g' \
     /etc/monit/monitrc || true
 
 # (re)generate monit.d files
@@ -73,20 +66,20 @@ update-monit.d || true
 
 # disable monit startup
 cp_check_and_sed '^startup[[:space:]]*=[[:space:]]*1' \
-    '^s/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
@@ -105,8 +98,7 @@ fi
 # install as inittab service
 if ! grep -q '/usr/sbin/monit' /etc/inittab; then
     echo "CN: Installing monit service in /etc/inittab"
-    rm -f /etc/inittab.$$
-    cp /etc/inittab /etc/inittab.$$
+    cp -a /etc/inittab /etc/inittab.$$
     cp-update monit-cn /etc/inittab.$$ <<EOF
 mo:2345:respawn:/usr/sbin/monit -Ic /etc/monit/monitrc
 m0:06:wait:/usr/sbin/monit -Ic /etc/monit/monitrc stop myprocess
@@ -116,8 +108,8 @@ 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
-kill -HUP 1
+pkill -9 -f '/usr/sbin/monit$' || true
+telinit q
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.