X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fmonit%2Ffiles%2Fpuppet;h=7368083677c5707f5763e369349f437da0a93f96;hb=a99babdcddb9c2f776c0a7f8355361caffc6ec20;hp=d1f5085c0cec2bb2f6ac9a738263beab013d5225;hpb=8609b9f14152dcb9b4b6ff706f664de0f345c6f1;p=dsa-puppet.git

diff --git a/modules/monit/files/puppet b/modules/monit/files/puppet
index d1f5085c..73680836 100644
--- a/modules/monit/files/puppet
+++ b/modules/monit/files/puppet
@@ -2,19 +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 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"
+    if timestamp > 120 minutes for 24 cycles then exec "service cron restart"