X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmonit%2Ffiles%2Fpuppet;h=d1f5085c0cec2bb2f6ac9a738263beab013d5225;hb=f5e933eb5ccba0be6e2be8e3add23669653a45fe;hp=5d3e21c273ab26971e82d37973750d4f5ce5d2cf;hpb=38c1d03fd5280e429c20bfd702effb497cff2ee1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/monit/files/puppet b/modules/monit/files/puppet
index 5d3e21c27..d1f5085c0 100644
--- a/modules/monit/files/puppet
+++ b/modules/monit/files/puppet
@@ -1,3 +1,7 @@
+##
+## 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"
@@ -5,3 +9,12 @@ check process puppetd with pidfile /var/run/puppet/puppetd.pid
     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 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"