X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ffiles%2Fdsa-puppet-stuff.cron;h=e173deb7243102aaa12430f47092b5552f184940;hb=2c8889fb72d9bfcc3cff5de485c927d64e7f78ed;hp=cda46a22db5f3b6d1a4618b4a941097655d139c3;hpb=2601a0eae20caccee89f8c7c73b9b142b65e1db9;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 cda46a22d..e173deb72 100644
--- a/modules/debian-org/files/dsa-puppet-stuff.cron
+++ b/modules/debian-org/files/dsa-puppet-stuff.cron
@@ -5,5 +5,5 @@
 
 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; 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
+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 {} \+