From: Stephen Gran Date: Fri, 25 Mar 2011 07:19:01 +0000 (+0000) Subject: Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a057a77fc2e7f761e7d6ae69655e91ff60d653a0;hp=b3c88aac91d04fb7f4a9b0aab62ed61331461ae0;p=dsa-puppet.git Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet --- diff --git a/modules/debian-org/files/dsa-puppet-stuff.cron b/modules/debian-org/files/dsa-puppet-stuff.cron index 97a23f5e..60486c28 100644 --- a/modules/debian-org/files/dsa-puppet-stuff.cron +++ b/modules/debian-org/files/dsa-puppet-stuff.cron @@ -1,4 +1,4 @@ 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 \% 3600 )); if [ -x /usr/bin/timeout ]; then TO="timeout 3600"; else TO=""; fi; $TO /usr/sbin/puppetd -o --no-daemonize 2>&1 | grep -v 'v6: error fetching interface information: Device not found' ; fi -@daily root find /var/lib/puppet/clientbucket/ -type f -mtime +30 -atime +30 exec rm {} \; +@daily root find /var/lib/puppet/clientbucket/ -type f -mtime +30 -atime +30 -exec rm {} \+