X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=7f1b54c230882e2b4980b403a47eec4138be5137;hb=fd0cdc2556c7ee3513781cab829c19f93a9fc350;hp=96b5e677015391174a1b3c5855012cd5f2e353c6;hpb=19d88c92d76bf0c3fc310599a2d3572c1ff50691;p=monit-cn.git

diff --git a/debian/postinst b/debian/postinst
index 96b5e67..7f1b54c 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
@@ -57,15 +57,8 @@ if grep -q '@localhost' /etc/monit/monitrc; then
 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' \
+    's/^set alert \([^[:space:]]*@[^[:space:]]*\) .*$/set alert \1 but not on { instance }/g' \
     /etc/monit/monitrc || true
 
 # (re)generate monit.d files