summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-02-19 19:09:19 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-02-19 19:09:19 -0200
commit1ce6003bf9710c1b75885a65b48fe8d638398e87 (patch)
tree63f9ba0b8eb868113417e63d8534dc398986e2ff /files
parentaf8c7b29e276d6b721fc5f51957f6d1f49408262 (diff)
downloadpuppet-puppet-1ce6003bf9710c1b75885a65b48fe8d638398e87.tar.gz
puppet-puppet-1ce6003bf9710c1b75885a65b48fe8d638398e87.tar.bz2
Restart puppet and puppetmaster from time to time
Diffstat (limited to 'files')
-rw-r--r--files/check-puppetd.sh1
-rw-r--r--files/cron.d/puppetd3
-rw-r--r--files/cron.d/puppetmaster3
3 files changed, 7 insertions, 0 deletions
diff --git a/files/check-puppetd.sh b/files/check-puppetd.sh
index c886ea3..10d6bc1 100644
--- a/files/check-puppetd.sh
+++ b/files/check-puppetd.sh
@@ -11,6 +11,7 @@ if [ ! -f "$PID" ]; then
else
running="$(ps $(cat $PID) &> /dev/null)"
if [ "$?" != "0" ]; then
+ sleep `echo $RANDOM/2000*60 | bc`
$INIT start
fi
fi
diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd
new file mode 100644
index 0000000..5a45875
--- /dev/null
+++ b/files/cron.d/puppetd
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000..4ea0b66
--- /dev/null
+++ b/files/cron.d/puppetmaster
@@ -0,0 +1,3 @@
+# we restart puppetmaster twice a day to avoid memory problems
+58 11 * * * root /etc/init.d/puppetmaster restart > /dev/null
+