use a puppet builtin for this

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/debian-org/files/dsa-puppet-stuff.cron b/modules/debian-org/files/dsa-puppet-stuff.cron
index d6f9fee9e0630db99ba11feb2a8ada02539f72ac..1aab5c7de6b07ae1c6a585ef1b9fafbef19b1f61 100644 (file)
--- a/modules/debian-org/files/dsa-puppet-stuff.cron
+++ b/modules/debian-org/files/dsa-puppet-stuff.cron
@@ -6,4 +6,3 @@
 SHELL=/bin/bash
 @hourly  root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
 34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 7200 )); if [ -x /usr/bin/timeout ]; then TO="timeout --kill-after=900 3600"; else TO=""; fi; tmp="$(tempfile)"; egrep -v '^(#|$)' /etc/dsa/cron.ignore.dsa-puppet-stuff > "$tmp" && $TO /usr/sbin/puppetd -o --no-daemonize 2>&1 | egrep --text -v -f "$tmp"; rm -f "$tmp"; fi
-@daily       root find /var/lib/puppet/clientbucket/ -type f -mtime +30 -atime +30 -exec rm {} \+

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 2afdd4f7b5220087f5175ae67ab593416687f99f..3ecb9278b9ff7ead8d821c90e69dbe0aab1a64ca 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -264,4 +264,12 @@ class debian-org {
        exec { 'init q':
                refreshonly => true
        }
+
+       tidy { '/var/lib/puppet/clientbucket/':
+               age      => '2w',
+               recurse  => 9,
+               type     => ctime,
+               matches  => [ 'paths', 'contents' ],
+               schedule => weekly
+       }
 }