X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Ffiles%2Fpuppet;h=0ce5c25e3d071d19b4a9cb88e85c542527adddbf;hb=3dd1d7496f5d3feaff05611b703e90851e12e089;hp=589ecbcf1957ea0badbb42b8b32252dae7d75c96;hpb=3a8d50d01fcd8639ed429909aead5ff8c002fe10;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/files/puppet b/modules/monit/files/puppet
index 589ecbcf1..0ce5c25e3 100644
--- a/modules/monit/files/puppet
+++ b/modules/monit/files/puppet
@@ -2,24 +2,8 @@
 ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
-check process puppetd with pidfile /var/run/puppet/puppetd.pid
-    start program = "/etc/init.d/puppet start"
-    stop program  = "/etc/init.d/puppet stop"
-    if cpu is greater than 80% for 3 cycles then alert
-    if cpu > 60% for 5 cycles then restart
-    if 5 restarts within 5 cycles then timeout
-
-check file puppetstate
-    with path /var/lib/puppet/state/state.yaml
-    if timestamp > 90 minutes for 9 cycles then exec "/etc/init.d/puppet stop"
-    depends on puppetd
-
-check process cron with pidfile /var/run/crond.pid
-    start program = "/etc/init.d/cron start"
-    stop program  = "/etc/init.d/cron stop"
-    if 5 restarts within 5 cycles then timeout
 
 check file cronalive
     with path /var/cache/dsa/cron.alive
-    if timestamp > 120 minutes for 5 cycles then exec "/etc/init.d/cron stop"
-    depends on crond
+    # a cycle is 5 minutes, 24 cycles is thus 2 hours
+    if timestamp > 120 minutes for 24 cycles then exec "/usr/sbin/service cron restart"