diff options
| author | mh <mh@immerda.ch> | 2008-07-22 21:33:56 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2008-07-22 21:33:56 +0000 |
| commit | 11168ee6885e6908c7c738dfa53ffabf59d9d660 (patch) | |
| tree | 1db39c7c9b3c907593c4364849be1ef2696cf755 /files | |
| parent | 89c06549397d6d52a16b25a0cf3b8d37a303dc77 (diff) | |
merged with puzzle
Diffstat (limited to 'files')
| -rw-r--r-- | files/.git_placeholder | 1 | ||||
| -rw-r--r-- | files/cron.d/puppetd | 2 | ||||
| -rw-r--r-- | files/cron.d/puppetd.CentOS | 2 | ||||
| -rw-r--r-- | files/cron.d/puppetd.Gentoo | 2 | ||||
| -rw-r--r--[l---------] | files/cron.d/puppetmaster | 3 |
5 files changed, 5 insertions, 5 deletions
diff --git a/files/.git_placeholder b/files/.git_placeholder deleted file mode 100644 index 89cb1fe..0000000 --- a/files/.git_placeholder +++ /dev/null @@ -1 +0,0 @@ -# file needed for git - don't remove it diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd index a4b19ac..7f66b29 100644 --- a/files/cron.d/puppetd +++ b/files/cron.d/puppetd @@ -1,4 +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 +0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep `echo $RANDOM/2000*60 | bc` && /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 a4b19ac..21fa439 100644 --- a/files/cron.d/puppetd.CentOS +++ b/files/cron.d/puppetd.CentOS @@ -1,4 +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 +0 * * * * root /etc/init.d/puppet status > /dev/null || (sleep `echo $RANDOM/2000*60 | bc` && /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 4f0db3c..68361f0 100644 --- a/files/cron.d/puppetd.Gentoo +++ b/files/cron.d/puppetd.Gentoo @@ -1,4 +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 +# 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep `echo $RANDOM/2000*60 | bc` && /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/puppetmaster b/files/cron.d/puppetmaster index 7e5177a..40a16e7 120000..100644 --- a/files/cron.d/puppetmaster +++ b/files/cron.d/puppetmaster @@ -1 +1,2 @@ -puppetmaster.CentOS
\ No newline at end of file +# we restart puppetmaster every 4 hours to avoid memory problems +0 */6 * * * root /etc/init.d/puppetmaster restart > /dev/null |