r14: - depend o novijem monitu

- svi tcp 110 sad koriste protocol pop3
- dodan saslauthd

diff --git a/debian/changelog b/debian/changelog
index eb7617b..93a907f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-monit-cn (1:4.5-2) stable; urgency=low
+monit-cn (1:4.8.1-1) stable; urgency=low
 
   * dodan postgrey servis
-  * rijesen minorni problem sa mysql konfiguracijom (Monit iz Sargea nema
-    protocol mysql, pa cemo koristiti type tcp)
+  * dodan asterisk servis
+  * dodan saslauthd servis
   * workaround za monit SystemV skriptu -- registriramo se na pocetak init
     skripte i javljamo da se koristi inittab
+  * ovisnost o Etch verziji monita (4.8.1-2.1)
+  * svi tcp 110 sad koriste protocol pop3
 
  -- Dinko Korunic <kreator@carnet.hr>  Thu, 25 Oct 2007 12:01:46 +0200
 

diff --git a/debian/control b/debian/control
index a47ccaa..3cd96a9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.7.2
 
 Package: monit-cn
 Architecture: all
-Depends: monit (>= 1:4.5-1), carnet-tools-cn (>= 2.1.8), awk
+Depends: monit (>= 1:4.8.1-2.1), carnet-tools-cn (>= 2.1.8), awk
 Description: A utility for monitoring and managing daemons or similar programs
  monit is a utility for monitoring and managing daemons or similar
  programs running on a Unix system. It will start specified programs

diff --git a/monit-cn/dovecot.conf b/monit-cn/dovecot.conf
index d0a55a1..7f7dfb5 100644 (file)
--- a/monit-cn/dovecot.conf
+++ b/monit-cn/dovecot.conf
@@ -6,5 +6,5 @@ check process dovecot with pidfile "/var/run/dovecot/master.pid"
        stop program = "/etc/init.d/dovecot stop"
        if failed host 127.0.0.1 port 143 protocol imap
                then restart
-       if failed host 127.0.0.1 port 110 type tcp
+       if failed host 127.0.0.1 port 110 protocol pop3
                then restart

diff --git a/monit-cn/freeradius.conf b/monit-cn/freeradius.conf
index a3ba685..eb2bdcd 100644 (file)
--- a/monit-cn/freeradius.conf
+++ b/monit-cn/freeradius.conf
@@ -5,3 +5,5 @@ check freeradius with pidfile "/var/run/freeradius/freeradius.pid"
     stop program = "/etc/init.d/freeradius stop"
     if failed host 127.0.0.1 port 1812 type udp
         then restart
+    #if failed host 127.0.0.1 port 1813 type udp
+    #    then restart

diff --git a/monit-cn/mysqld.conf b/monit-cn/mysqld.conf
index af671e2..857f4d9 100644 (file)
--- a/monit-cn/mysqld.conf
+++ b/monit-cn/mysqld.conf
@@ -3,9 +3,6 @@
 check process mysql with pidfile "/var/run/mysqld/mysqld.pid"
        start program = "/etc/init.d/mysql start"
        stop program = "/etc/init.d/mysql stop"
-       #if failed host 127.0.0.1 port 3306 protocol mysql
-       #       with timeout 10 seconds
-       #       then restart
-       if failed host 127.0.0.1 port 3306 type tcp
+       if failed host 127.0.0.1 port 3306 protocol mysql
                with timeout 10 seconds
                then restart

diff --git a/monit-cn/qpopper.conf b/monit-cn/qpopper.conf
index 297df59..8494c28 100644 (file)
--- a/monit-cn/qpopper.conf
+++ b/monit-cn/qpopper.conf
@@ -4,5 +4,5 @@ check process qpopper with pidfile "/var/run/popper.pid"
        group mail
        start program = "/etc/init.d/qpopper start"
        stop program = "/etc/init.d/qpopper stop"
-       if failed host 127.0.0.1 port 110 type tcp
+       if failed host 127.0.0.1 port 110 type pop3
                then restart

diff --git a/monit-cn/saslauthd.conf b/monit-cn/saslauthd.conf
new file mode 100644 (file)
index 0000000..f75e607
--- /dev/null
+++ b/monit-cn/saslauthd.conf
@@ -0,0 +1,6 @@
+# saslauthd monit-cn template
+
+check process saslauthd with pidfile "/var/run/saslauthd/saslauthd.pid"
+       group mail
+       start program = "/etc/init.d/saslauthd start"
+       stop program = "/etc/init.d/saslauthd stop"