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

diff --git a/debian/postinst b/debian/postinst
index f43d933..25a4a2f 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -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
@@ -116,7 +109,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
-/bin/kill -HUP 1
+telinit q
 
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.