X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Ffiles%2Fpuppet;h=b08ec0c7e518be4d0498617fa90410036bbe06c2;hb=f33509a3d3e89536bbd70fbc9df310b90dd88f45;hp=37c728b281523446512a671f9ff1aadc6bfe5fa9;hpb=1fe2671e14411277863ed8132b213d0fb90b536e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/files/puppet b/modules/monit/files/puppet
index 37c728b28..b08ec0c7e 100644
--- a/modules/monit/files/puppet
+++ b/modules/monit/files/puppet
@@ -2,10 +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 cronalive
+    with path /var/cache/dsa/cron.alive
+    # a cycle is 5 minutes, 24 cycles is thus 2 hours
+    if timestamp > 120 minutes for 24 cycles then exec "/etc/init.d/cron restart"