Add munin-async service to the catalog

[mirror/dsa-puppet.git] / modules / munin / files / master-cleanup-cron

diff --git a/modules/munin/files/master-cleanup-cron b/modules/munin/files/master-cleanup-cron
index 7092b4b..3138588 100644 (file)
--- 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)'