From 47af90247485c22326c95621806087f25088520f Mon Sep 17 00:00:00 2001 From: Micah Anderson Date: Mon, 10 Jan 2011 20:46:10 -0500 Subject: fix the bc dependency (closes: #2690) this is done by removing the hacky `if !defined` on the bc package by removing the package dependency altogether and replacing the places where it is used by shell built-in math functions. this is a follow-up commit to 1455b1f9a55cdffc582fd93fa0bc5c016585760c --- files/cron.d/puppetd | 4 ++-- files/cron.d/puppetd.CentOS | 4 ++-- files/cron.d/puppetd.Gentoo | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'files') diff --git a/files/cron.d/puppetd b/files/cron.d/puppetd index 92af3e2..8b2c289 100644 --- a/files/cron.d/puppetd +++ b/files/cron.d/puppetd @@ -1,5 +1,5 @@ # check if puppet is running -0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart) +0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || (sleep $(($RANDOM/2000*60)) && /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 +0 22 * * */2 root sleep $(($RANDOM/1000*60)) && /etc/init.d/puppet restart > /dev/null diff --git a/files/cron.d/puppetd.CentOS b/files/cron.d/puppetd.CentOS index 9787231..65239ce 100644 --- a/files/cron.d/puppetd.CentOS +++ b/files/cron.d/puppetd.CentOS @@ -1,5 +1,5 @@ # check if puppet is running -0 * * * * root /etc/init.d/puppet status > /dev/null || (sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart) +0 * * * * root /etc/init.d/puppet status > /dev/null || (sleep $(($RANDOM/2000*60)) && /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 +0 22 * * */2 root sleep $(($RANDOM/1000*60)) && /etc/init.d/puppet restart > /dev/null diff --git a/files/cron.d/puppetd.Gentoo b/files/cron.d/puppetd.Gentoo index 29655b9..c9811c2 100644 --- a/files/cron.d/puppetd.Gentoo +++ b/files/cron.d/puppetd.Gentoo @@ -1,5 +1,5 @@ # check if puppet is running -# 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep `echo $RANDOM/2000*60 | bc` && /etc/init.d/puppet restart ) +# 0 * * * * root /bin/ps ax | /bin/grep -v grep | /bin/grep -q puppetd || ( sleep $(($RANDOM/2000*60)) && /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 +# 0 22 * * */2 root sleep $(($RANDOM/1000*60)) && /etc/init.d/puppet restart > /dev/null -- cgit v1.2.3