Do not run both puppet clientbucket cleanup job concurrently. sequentially should...

diff --git a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
index 7908ee6..3aa7328 100644 (file)
--- a/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
+++ b/modules/debian-org/templates/dsa-puppet-stuff.cron.erb
@@ -15,5 +15,4 @@ SHELL=/bin/bash
 
 @daily munin-async [ -d /var/lib/munin-async ] && find /var/lib/munin-async -maxdepth 1 -type f -mtime +30 -delete
 
-@daily root [ -d /var/lib/puppet/clientbucket ] && find /var/lib/puppet/clientbucket -type f -mtime +60 -delete
-@daily root [ -d /var/lib/puppet/clientbucket ] && find /var/lib/puppet/clientbucket -type d -empty -delete
+@daily root [ -d /var/lib/puppet/clientbucket ] && find /var/lib/puppet/clientbucket -type f -mtime +60 -delete && find /var/lib/puppet/clientbucket -type d -empty -delete