From: Dinko Korunic <kreator@carnet.hr>
Date: Wed, 27 Apr 2011 18:09:46 +0000 (+0200)
Subject: - update monitrc za Squeeze
X-Git-Tag: v5.1.2~3
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=709fdb91b20f897277f8ac5fd5b87d1671d33905;p=monit-cn.git

- update monitrc za Squeeze
---

diff --git a/debian/postinst b/debian/postinst
index 7f1b54c..88bca34 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -57,8 +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:]]*$' \
-    's/^set alert \([^[:space:]]*@[^[:space:]]*\) .*$/set alert \1 but not on { instance }/g' \
+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
diff --git a/monit-cn/monitrc b/monit-cn/monitrc
index baf3fc9..ae12989 100644
--- a/monit-cn/monitrc
+++ b/monit-cn/monitrc
@@ -9,7 +9,7 @@ set mail-format {
     message: monit $ACTION $SERVICE at $DATE on $HOST
     }
 set mailserver 127.0.0.1
-set alert root@localhost only on { uid, gid, size, nonexist, data, icmp, instance, invalid, exec, timeout, resource, checksum, match, timestamp, connection, permission }
+set alert root@localhost but not on { instance }
 
 #set httpd port 2812 and use address 127.0.0.1
 #allow localhost