projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet
[mirror/dsa-puppet.git]
/
files
/
etc
/
cron.d
/
dsa-puppet-stuff
diff --git
a/files/etc/cron.d/dsa-puppet-stuff
b/files/etc/cron.d/dsa-puppet-stuff
index
3750093
..
f3aa1a5
100644
(file)
--- 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
SHELL=/bin/bash
@hourly root [ ! -d /var/cache/dsa ] || touch /var/cache/dsa/cron.alive
-34 */4 * * * root
[ ! -x /usr/sbin/puppetd ] || ( sleep $(( $RANDOM \% 3600 )) && /usr/sbin/puppetd -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