X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fcron.d%2Fdsa-puppet-stuff;h=5bbf6c443fd0fe13c1e10f25fda35accbf0e971d;hb=f17c24bcbf94ab71057e5695ef61f849689dd5b0;hp=be16af11792e31cbd7769ff45164f3fb1c5019f1;hpb=067fb4e2b1874295ea778e3c48c15c96f56adfbd;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/cron.d/dsa-puppet-stuff b/files/etc/cron.d/dsa-puppet-stuff
index be16af117..5bbf6c443 100644
--- a/files/etc/cron.d/dsa-puppet-stuff
+++ b/files/etc/cron.d/dsa-puppet-stuff
@@ -1,3 +1,3 @@
 SHELL=/bin/bash
 @hourly  root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
-34 */4 * * * root [ ! -x /usr/sbin/puppet ] || ( sleep $(( $RANDOM % 3600 )) && /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 2>&1 | grep -v 'v6: error fetching interface information: Device not found' ; fi