* Dodane nove template konfiguracije za nginx, nsd3 i rsyslogd

  * popravljena greska u thttpd templateu

diff --git a/README.CARNet b/README.CARNet
index a8f4539..b89deb6 100644 (file)
--- a/README.CARNet
+++ b/README.CARNet
@@ -17,16 +17,17 @@ monit servis ako je aktivan.
 
 Za sljedece servise dolaze gotovi predlosci:
 
-  amavisd.conf   dovecot.conf             ntp-server.conf     saslauthd.conf
-  aosi.conf      dsmc.conf                ntp.conf            sendmail.conf
-  apache1.conf   exim.conf                openldap.conf       snmpd.conf
-  apache2.conf   freeradius.conf          pdns-recursor.conf  sophie.conf
-  asterisk.conf  mailgraph.conf           pdns.conf           sshd.conf
-  bind8.conf     mailman.conf             postfix.conf        syslogd.conf
-  bind9.conf     maradns-zoneserver.conf  postgrey.conf       thttpd.conf
-  clamd.conf     maradns.conf             proftpd.conf        tomcat5.conf
-  cron.conf      monitrc                  qpopper.conf        vsftpd.conf
-  dhcpd3.conf    mysqld.conf              samba.conf
+  amavisd.conf   dsmc.conf                ntp-server.conf     saslauthd.conf
+  aosi.conf      exim.conf                ntp.conf            sendmail.conf
+  apache1.conf   freeradius.conf          openldap.conf       snmpd.conf
+  apache2.conf   mailgraph.conf           pdns-recursor.conf  sophie.conf
+  asterisk.conf  mailman.conf             pdns.conf           sshd.conf
+  bind8.conf     maradns-zoneserver.conf  postfix.conf        syslogd.conf
+  bind9.conf     maradns.conf             postgrey.conf       thttpd.conf
+  clamd.conf     monitrc                  proftpd.conf        tomcat5.conf
+  cron.conf      mysqld.conf              qpopper.conf        vsftpd.conf
+  dhcpd3.conf    nginx.conf               rsyslogd.conf
+  dovecot.conf   nsd3.conf                samba.conf
 
 Primijetite da je monit respawnable proces -- on ne starta kroz
 /etc/init.d/monit skripte (tzv. System V init skripte), vec kroz
@@ -34,4 +35,4 @@ Primijetite da je monit respawnable proces -- on ne starta kroz
 "padne" ili ga nehotice netko "ubije", on ce se automatski odmah pokrenuti
 nazad.
 
- -- Dinko Korunic <kreator@CARNet.hr> at  Sun, 12 Apr 2009 16:32:42 +0200
+ -- Dinko Korunic <kreator@CARNet.hr>  Sat, 12 Sep 2009 00:01:41 +0200

diff --git a/debian/changelog b/debian/changelog
index 8646429..b56fa30 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monit-cn (1:4.10.1-2) stable; urgency=low
+
+  * Dodane nove template konfiguracije za nginx, nsd3 i rsyslogd
+  * popravljena greska u thttpd templateu
+
+ -- Dinko Korunic <kreator@carnet.hr>  Fri, 11 Sep 2009 23:59:57 +0200
+
 monit-cn (1:4.10.1-1) stable; urgency=low
 
   * Update paketa za Lenny

diff --git a/monit-cn/nginx.conf b/monit-cn/nginx.conf
new file mode 100644 (file)
index 0000000..014baf4
--- /dev/null
+++ b/monit-cn/nginx.conf
@@ -0,0 +1,13 @@
+## Begin - Generated by CARNet package monit-cn
+#
+#  This is a monit-cn template file.  REMOVE this whole comment block if
+#  you DON'T WANT monit-cn to edit/remove/delete your configuration file.
+#
+## End - Generated by CARNet package monit-cn
+
+check process nginx with pidfile "/var/run/nginx.pid"
+    start program = "/etc/init.d/nginx start"
+    stop program = "/etc/init.d/nginx stop"
+       if failed host 127.0.0.1 port 80 protocol http
+        with timeout 15 seconds
+        then restart

diff --git a/monit-cn/nsd3.conf b/monit-cn/nsd3.conf
new file mode 100644 (file)
index 0000000..e239bb9
--- /dev/null
+++ b/monit-cn/nsd3.conf
@@ -0,0 +1,14 @@
+## Begin - Generated by CARNet package monit-cn
+#
+#  This is a monit-cn template file.  REMOVE this whole comment block if
+#  you DON'T WANT monit-cn to edit/remove/delete your configuration file.
+#
+## End - Generated by CARNet package monit-cn
+
+check process nsd3 with pidfile "/var/run/nsd3/nsd.pid"
+    start program = "/etc/init.d/nsd3 start"
+    stop program = "/etc/init.d/nsd3 stop"
+    if failed host 127.0.0.1 port 53 type tcp
+        then restart
+    if failed host 127.0.0.1 port 53 type udp
+        then restart

diff --git a/monit-cn/rsyslogd.conf b/monit-cn/rsyslogd.conf
new file mode 100644 (file)
index 0000000..00b1051
--- /dev/null
+++ b/monit-cn/rsyslogd.conf
@@ -0,0 +1,10 @@
+## Begin - Generated by CARNet package monit-cn
+#
+#  This is a monit-cn template file.  REMOVE this whole comment block if
+#  you DON'T WANT monit-cn to edit/remove/delete your configuration file.
+#
+## End - Generated by CARNet package monit-cn
+
+check process rsyslogd with pidfile "/var/run/rsyslogd.pid"
+    start program = "/etc/init.d/rsyslog start"
+    stop program = "/etc/init.d/rsyslog stop"

diff --git a/monit-cn/thttpd.conf b/monit-cn/thttpd.conf
index 168da25..27dfdce 100644 (file)
--- a/monit-cn/thttpd.conf
+++ b/monit-cn/thttpd.conf
@@ -8,7 +8,6 @@
 check process thttpd with pidfile "/var/run/thttpd.pid"
        start program = "/etc/init.d/thttpd start"
        stop program = "/etc/init.d/thttpd stop"
-       if failed host 127.0.0.1 port 80
+       if failed host 127.0.0.1 port 80 protocol http
                with timeout 15 seconds
                then restart
-       if children > 100 then restart