X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ffiles%2Fdsa-puppet-stuff.cron;h=e173deb7243102aaa12430f47092b5552f184940;hb=23b4b5adae9a75e3fcb27261b559b2fb497f85c3;hp=5bbf6c443fd0fe13c1e10f25fda35accbf0e971d;hpb=10798926214f5796ff758ff8a84c01b19647e598;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/files/dsa-puppet-stuff.cron b/modules/debian-org/files/dsa-puppet-stuff.cron
index 5bbf6c443..e173deb72 100644
--- a/modules/debian-org/files/dsa-puppet-stuff.cron
+++ b/modules/debian-org/files/dsa-puppet-stuff.cron
@@ -1,3 +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
+##
+
 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 --factsync -o --no-daemonize 2>&1 | grep -v 'v6: error fetching interface information: Device not found' ; fi
+34 */4 * * * root if [ -x /usr/sbin/puppetd ]; then sleep $(( $RANDOM \% 3600 )); 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 {} \+