Fix race condition cleaning up munin CGI graphs

Avoids mails like these:

From:    Cron Daemon <root@menotti.debian.org>
To:      root@menotti.debian.org
Subject: Cron <www-data@menotti> find /var/lib/munin/cgi-tmp -mindepth 2 -type d -empty -delete

find: `/var/lib/munin/cgi-tmp/munin-cgi-graph/debian.org/bm-bl9.debian.org/iostat-month.png': No such file or directory
find: `/var/lib/munin/cgi-tmp/munin-cgi-graph/debian.org/bm-bl9.debian.org/df_inode-day.png': No such file or directory
find: `/var/lib/munin/cgi-tmp/munin-cgi-graph/debian.org/bm-bl9.debian.org/ps_exim4-month.png': No such file or directory
find: `/var/lib/munin/cgi-tmp/munin-cgi-graph/debian.org/bm-bl9.debian.org/exim_mailstats-month.png': No such file or directory
...

diff --git a/modules/munin/files/master-cleanup-cron b/modules/munin/files/master-cleanup-cron
index 883998a..7092b4b 100644 (file)
--- a/modules/munin/files/master-cleanup-cron
+++ b/modules/munin/files/master-cleanup-cron
@@ -5,5 +5,4 @@ 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
-@daily www-data find /var/lib/munin/cgi-tmp -mindepth 2 -type d -empty -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