X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fcron.d%2Fdsa-puppet-stuff;h=f3aa1a5baf697d7182211060510650697dc74866;hb=e5c0f9f8fd186a77ad0b77611f06072613b7b44f;hp=4ddc565ae31298abcfd5cd20b19b698111570015;hpb=acc671d3ab179f7369d5f22bcfabe349b373e19e;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/cron.d/dsa-puppet-stuff b/files/etc/cron.d/dsa-puppet-stuff
index 4ddc565ae..f3aa1a5ba 100644
--- a/files/etc/cron.d/dsa-puppet-stuff
+++ b/files/etc/cron.d/dsa-puppet-stuff
@@ -1,2 +1,3 @@
+SHELL=/bin/bash
 @hourly  root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
-34 */4 * * * root [ ! -x /usr/sbin/puppet ] || /usr/sbin/puppet -w 5 --factsync -t
+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 ; fi