From 8ba7781b74fcf9df3120f60247edb064712d3614 Mon Sep 17 00:00:00 2001 From: Dinko Korunic Date: Tue, 22 Apr 2008 10:32:01 +0200 Subject: [PATCH] - maknute grupe iz predlozaka konfiguracija - preimenovan ntpd u ntp predlozak za Etch - dodan ntp-server predlozak za Sarge - u ntp predloske dodana provjera za 127.0.0.1 123/udp portom Signed-off-by: Dinko Korunic --- debian/changelog | 9 +++++++++ monit-cn/amavisd.conf | 1 - monit-cn/clamd.conf | 1 - monit-cn/cron.conf | 1 - monit-cn/dovecot.conf | 1 - monit-cn/exim.conf | 1 - monit-cn/ntp-server.conf | 12 ++++++++++++ monit-cn/{ntpd.conf => ntp.conf} | 6 ++++-- monit-cn/postfix.conf | 1 - monit-cn/postgrey.conf | 1 - monit-cn/qpopper.conf | 1 - monit-cn/samba.conf | 2 -- monit-cn/saslauthd.conf | 1 - monit-cn/sendmail.conf | 1 - monit-cn/sophie.conf | 1 - 15 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 monit-cn/ntp-server.conf rename monit-cn/{ntpd.conf => ntp.conf} (67%) diff --git a/debian/changelog b/debian/changelog index 97179c1..d2258b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +monit-cn (1:4.8.1-6) stable; urgency=low + + * maknute grupe iz predlozaka konfiguracija + * preimenovan ntpd u ntp predlozak za Etch + * dodan ntp-server predlozak za Sarge + * u ntp predloske dodana provjera za 127.0.0.1 123/udp portom + + -- Dinko Korunic Tue, 22 Apr 2008 10:30:29 +0200 + monit-cn (1:4.8.1-5) stable; urgency=low * popravljena greska u postinstu vezano uz sed na /etc/default/monit diff --git a/monit-cn/amavisd.conf b/monit-cn/amavisd.conf index a73f469..3648ed8 100644 --- a/monit-cn/amavisd.conf +++ b/monit-cn/amavisd.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process amavisd with pidfile "/var/run/amavis/amavisd.pid" - group mail start program = "/etc/init.d/amavis start" stop program = "/etc/init.d/amavis stop" if failed host 127.0.0.1 port 10024 type tcp diff --git a/monit-cn/clamd.conf b/monit-cn/clamd.conf index 28360c1..f81fcc1 100644 --- a/monit-cn/clamd.conf +++ b/monit-cn/clamd.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process clamd with pidfile "/var/run/clamav/clamd.pid" - group mail start program = "/etc/init.d/clamav-daemon start" stop program = "/etc/init.d/clamav-daemon stop" if failed unixsocket "/var/run/clamav/clamd.ctl" diff --git a/monit-cn/cron.conf b/monit-cn/cron.conf index dfee8bb..7867868 100644 --- a/monit-cn/cron.conf +++ b/monit-cn/cron.conf @@ -6,6 +6,5 @@ ## End - Generated by CARNet package monit-cn check process cron with pidfile "/var/run/cron.pid" - group system start program = "/etc/init.d/cron start" stop program = "/etc/init.d/cron stop" diff --git a/monit-cn/dovecot.conf b/monit-cn/dovecot.conf index 73bc302..672433a 100644 --- a/monit-cn/dovecot.conf +++ b/monit-cn/dovecot.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process dovecot with pidfile "/var/run/dovecot/master.pid" - group mail start program = "/etc/init.d/dovecot start" stop program = "/etc/init.d/dovecot stop" if failed host 127.0.0.1 port 143 protocol imap diff --git a/monit-cn/exim.conf b/monit-cn/exim.conf index 0b6468b..b30bbbb 100644 --- a/monit-cn/exim.conf +++ b/monit-cn/exim.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process exim4 with pidfile "/var/run/exim4/exim.pid" - group mail start program = "/etc/init.d/exim4 start" stop program = "/etc/init.d/exim4 stop" if failed host 127.0.0.1 port 25 protocol smtp diff --git a/monit-cn/ntp-server.conf b/monit-cn/ntp-server.conf new file mode 100644 index 0000000..b4aaa97 --- /dev/null +++ b/monit-cn/ntp-server.conf @@ -0,0 +1,12 @@ +## 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 ntpd with pidfile "/var/run/ntpd.pid" + start program = "/etc/init.d/ntp-server start" + stop program = "/etc/init.d/ntp-server stop" + if failed host 127.0.0.1 port 123 type udp + then restart diff --git a/monit-cn/ntpd.conf b/monit-cn/ntp.conf similarity index 67% rename from monit-cn/ntpd.conf rename to monit-cn/ntp.conf index c8640ca..bb3cb29 100644 --- a/monit-cn/ntpd.conf +++ b/monit-cn/ntp.conf @@ -6,5 +6,7 @@ ## End - Generated by CARNet package monit-cn check process ntpd with pidfile "/var/run/ntpd.pid" - start program = "/etc/init.d/ntpd start" - stop program = "/etc/init.d/ntpd stop" + start program = "/etc/init.d/ntp start" + stop program = "/etc/init.d/ntp stop" + if failed host 127.0.0.1 port 123 type udp + then restart diff --git a/monit-cn/postfix.conf b/monit-cn/postfix.conf index b7fe58c..13c1579 100644 --- a/monit-cn/postfix.conf +++ b/monit-cn/postfix.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process postfix with pidfile "/var/spool/postfix/pid/master.pid" - group mail start program = "/etc/init.d/postfix start" stop program = "/etc/init.d/postfix stop" if failed host 127.0.0.1 port 25 protocol smtp diff --git a/monit-cn/postgrey.conf b/monit-cn/postgrey.conf index 27740d3..94bcee7 100644 --- a/monit-cn/postgrey.conf +++ b/monit-cn/postgrey.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process postgrey with pidfile "/var/run/postgrey.pid" - group mail start program = "/etc/init.d/postgrey start" stop program = "/etc/init.d/postgrey stop" if failed host 127.0.0.1 port 60000 type tcp diff --git a/monit-cn/qpopper.conf b/monit-cn/qpopper.conf index 320b63b..b44d5e9 100644 --- a/monit-cn/qpopper.conf +++ b/monit-cn/qpopper.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn 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 protocol pop diff --git a/monit-cn/samba.conf b/monit-cn/samba.conf index dd8bde9..a3f0787 100644 --- a/monit-cn/samba.conf +++ b/monit-cn/samba.conf @@ -6,11 +6,9 @@ ## End - Generated by CARNet package monit-cn check process smbd with pidfile "/var/run/samba/smbd.pid" - group system start program = "/etc/init.d/samba start" stop program = "/etc/init.d/samba stop" check process nmbd with pidfile "/var/run/samba/nmbd.pid" - group system start program = "/etc/init.d/samba start" stop program = "/etc/init.d/samba stop" diff --git a/monit-cn/saslauthd.conf b/monit-cn/saslauthd.conf index b3445a3..b44cfa4 100644 --- a/monit-cn/saslauthd.conf +++ b/monit-cn/saslauthd.conf @@ -6,6 +6,5 @@ ## End - Generated by CARNet package monit-cn 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" diff --git a/monit-cn/sendmail.conf b/monit-cn/sendmail.conf index 8fc300d..1b43075 100644 --- a/monit-cn/sendmail.conf +++ b/monit-cn/sendmail.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process sendmail with pidfile "/var/run/sendmail.pid" - group mail start program = "/etc/init.d/sendmail start" stop program = "/etc/init.d/sendmail stop" if failed host 127.0.0.1 port 25 protocol smtp diff --git a/monit-cn/sophie.conf b/monit-cn/sophie.conf index 5028c4a..c8171fc 100644 --- a/monit-cn/sophie.conf +++ b/monit-cn/sophie.conf @@ -6,7 +6,6 @@ ## End - Generated by CARNet package monit-cn check process sophie with pidfile "/var/run/sophie/pid" - group mail start program = "/etc/init.d/sophie start" stop program = "/etc/init.d/sophie stop" if failed unixsocket "/var/run/sophie/sock" -- 1.7.10.4