diff options
-rw-r--r-- | files/cron.d/puppetd | 3 | ||||
-rw-r--r-- | files/cron.d/puppetd.CentOS | 3 | ||||
-rw-r--r-- | files/cron.d/puppetd.Gentoo | 5 | ||||
-rw-r--r-- | manifests/init.pp | 7 |
4 files changed, 12 insertions, 6 deletions
diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd index bf19ea7..a4b19ac 100644 --- a/files/cron.d/puppetd +++ b/files/cron.d/puppetd @@ -1 +1,4 @@ +# check if puppet is running 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart +# 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 diff --git a/files/cron.d/puppetd.CentOS b/files/cron.d/puppetd.CentOS index bf19ea7..a4b19ac 100644 --- a/files/cron.d/puppetd.CentOS +++ b/files/cron.d/puppetd.CentOS @@ -1 +1,4 @@ +# check if puppet is running 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart +# 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 diff --git a/files/cron.d/puppetd.Gentoo b/files/cron.d/puppetd.Gentoo index 9f9e36d..4f0db3c 100644 --- a/files/cron.d/puppetd.Gentoo +++ b/files/cron.d/puppetd.Gentoo @@ -1 +1,4 @@ -#0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart +# check if puppet is running +# 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep puppetd > /dev/null || /etc/init.d/puppet restart +# 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 diff --git a/manifests/init.pp b/manifests/init.pp index 5360cfe..3454856 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -50,11 +50,8 @@ class puppet { } class puppet::linux { - package{'puppet': - ensure => present, - } - - package{'facter': + # package bc needed for cron + package{ [ 'puppet', 'facter', 'bc' ]: ensure => present, } |