From: Dinko Korunic <Dinko.Korunic@CARNet.hr>
Date: Tue, 5 Feb 2008 16:18:48 +0000 (+0000)
Subject: r18: - popravljena greska u defaultnom templateu za "alert on"
X-Git-Tag: v4.10.1-3~19
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=ff6e29a0b03ab8c26b5e49bcb7e4d74ef84d02cb;p=monit-cn.git

r18: - popravljena greska u defaultnom templateu za "alert on"
- dodan klogd u syslogd template
---

diff --git a/debian/changelog b/debian/changelog
index e288167..0f71a31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monit-cn (1:4.8.1-4) stable; urgency=low
+
+  * popravljena greska u defaultnom templateu za "alert on"
+  * dodan klogd u syslogd template
+
+ -- Dinko Korunic <kreator@carnet.hr>  Tue,  5 Feb 2008 16:44:13 +0100
+
 monit-cn (1:4.8.1-3) stable; urgency=low
 
   * salji root@localhost mail u svim slucajevima, osim ako je servis
diff --git a/debian/postinst b/debian/postinst
index f08d307..7324eec 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...
diff --git a/monit-cn/monitrc b/monit-cn/monitrc
index b18d4e9..baf3fc9 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 but not on { changed }
+set alert root@localhost only on { uid, gid, size, nonexist, data, icmp, instance, invalid, exec, timeout, resource, checksum, match, timestamp, connection, permission }
 
 #set httpd port 2812 and use address 127.0.0.1
 #allow localhost
diff --git a/monit-cn/syslogd.conf b/monit-cn/syslogd.conf
index 5e368f4..cf65af7 100644
--- a/monit-cn/syslogd.conf
+++ b/monit-cn/syslogd.conf
@@ -1,5 +1,9 @@
-# syslogd monit-cn template
+# syslogd/klogd monit-cn template
 
 check process syslogd with pidfile "/var/run/syslogd.pid"
     start program = "/etc/init.d/sysklogd start"
     stop program = "/etc/init.d/sysklogd stop"
+
+check process klogd with pidfile "/var/run/klogd.pid"
+    start program = "/etc/init.d/klogd start"
+    stop program = "/etc/init.d/klogd stop"