summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-21 14:41:39 -0300
committerSilvio Rhatto <rhatto@riseup.net>2011-02-21 14:41:39 -0300
commitafb66d541c0fcaf136cbc64aa11efa3b3aeb3155 (patch)
treee0bf34b0c871d2d29edf854d5bc7f92d28021f7a
parent51865fd8bfacc87e1ab85d560eb4f182a5d9113c (diff)
downloadpuppet-puppet-afb66d541c0fcaf136cbc64aa11efa3b3aeb3155.tar.gz
puppet-puppet-afb66d541c0fcaf136cbc64aa11efa3b3aeb3155.tar.bz2
Puppet restart cronjob needs bash to use $RANDOM
-rw-r--r--files/cron.d/puppetd2
-rw-r--r--manifests/puppetd.pp1
-rw-r--r--manifests/puppetmasterd.pp1
3 files changed, 3 insertions, 1 deletions
diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd
index 2cb9acf..3e356ae 100644
--- a/files/cron.d/puppetd
+++ b/files/cron.d/puppetd
@@ -1,2 +1,2 @@
# restart puppet once in a while and randomly delay the restart between 0 and 32 minutes -> splay puppetmaster hammering
-0 22 * * */2 root sleep `echo $RANDOM/1000*60 | bc` && /etc/init.d/puppet restart > /dev/null
+0 22 * * */2 root /bin/bash -c "sleep `echo $RANDOM/1000*60 | bc` && /etc/init.d/puppet restart" > /dev/null
diff --git a/manifests/puppetd.pp b/manifests/puppetd.pp
index 7f00241..f2c6680 100644
--- a/manifests/puppetd.pp
+++ b/manifests/puppetd.pp
@@ -75,6 +75,7 @@ class puppetd inherits puppet {
ensure => present,
}
+ # thanks to https://labs.riseup.net/code/projects/shared-puppet
file { "/etc/cron.d/puppetd":
source => "puppet://$server/modules/puppet/cron.d/puppetd",
owner => root,
diff --git a/manifests/puppetmasterd.pp b/manifests/puppetmasterd.pp
index 67ec4b4..c8ccc7a 100644
--- a/manifests/puppetmasterd.pp
+++ b/manifests/puppetmasterd.pp
@@ -107,6 +107,7 @@ class puppetmasterd {
}
# restart the master from time to time to avoid memory problems
+ # thanks to https://labs.riseup.net/code/projects/shared-puppet
file { "/etc/cron.d/puppetmaster":
source => "puppet://$server/modules/puppet/cron.d/puppetmaster",
owner => root,