X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fmunin%2Ffiles%2Fmaster-cleanup-cron;h=3138588ab8cd84ee81c67eaa52706e5020d05628;hb=a4a85846f684e9a78f711071b681276c960920ba;hp=7092b4b7cae0cef53f56a1dd77ade9d1cae2f42a;hpb=cc5d34733d8f483e38af9951d54f9cc9b294ad66;p=mirror%2Fdsa-puppet.git

diff --git a/modules/munin/files/master-cleanup-cron b/modules/munin/files/master-cleanup-cron
index 7092b4b7c..3138588ab 100644
--- a/modules/munin/files/master-cleanup-cron
+++ b/modules/munin/files/master-cleanup-cron
@@ -1,8 +1,9 @@
 ## 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
 
-MAILTO=root
-
 @daily munin    find /var/lib/munin  -maxdepth 1 -type f -name 'state-*' -mtime +90 -delete
 @daily munin    find /var/lib/munin/debian.org -maxdepth 1 -type f -mtime +90 -delete
 @daily www-data find /var/lib/munin/cgi-tmp -type f -mtime +10 -delete ; find /var/lib/munin/cgi-tmp -mindepth 2 -type d -empty -delete
+
+# kill munin-update jobs older than 2 hours
+@hourly munin   ps h -eo pid,etimes,user,args | perl -a -e '($pid,$age,$user,@cmd) = @F; $cmd = join(" ", @cmd); next if ($user ne "munin" or $cmd !~ "munin-update" or $age <= 2*3600); kill("TERM", $pid)'