diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-19 18:42:14 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-03-19 18:42:14 +0000 |
| commit | 1f8b768e4ebef4e9ee54ee96db2544d6f9522bbf (patch) | |
| tree | 718cc17c2004767b25810bd6dbf7776de3049b6a /conf | |
| parent | 3e2510f697413e9237ca2c7107857f1d6f32e602 (diff) | |
| download | puppet-1f8b768e4ebef4e9ee54ee96db2544d6f9522bbf.tar.gz puppet-1f8b768e4ebef4e9ee54ee96db2544d6f9522bbf.tar.xz puppet-1f8b768e4ebef4e9ee54ee96db2544d6f9522bbf.zip | |
Apply patch from Ian Burrel (trac #479)
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2323 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/redhat/client.init | 15 | ||||
| -rw-r--r-- | conf/redhat/logrotate | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init index 4e27f736c..fa73efd8e 100644 --- a/conf/redhat/client.init +++ b/conf/redhat/client.init @@ -49,7 +49,7 @@ stop() { [ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile} } -restart() { +reload() { echo -n $"Restarting puppet: " killproc $puppetd -HUP RETVAL=$? @@ -57,6 +57,11 @@ restart() { return $RETVAL } +restart() { + stop + start +} + case "$1" in start) start @@ -64,13 +69,13 @@ case "$1" in stop) stop ;; - restart|force-reload) + restart) restart ;; - reload) - restart + reload|force-reload) + reload ;; - condrestart) + condrestart|try-restart) [ -f "$pidfile" ] && restart ;; status) diff --git a/conf/redhat/logrotate b/conf/redhat/logrotate index 01765baf5..e336d60f5 100644 --- a/conf/redhat/logrotate +++ b/conf/redhat/logrotate @@ -3,6 +3,6 @@ create 0644 puppet puppet postrotate [ -e /etc/init.d/puppetmaster ] && /etc/init.d/puppetmaster condrestart >/dev/null 2>&1 || true - [ -e /etc/init.d/puppet ] && /etc/init.d/puppet condrestart > /dev/null 2>&1 || true + [ -e /etc/init.d/puppet ] && /etc/init.d/puppet reload > /dev/null 2>&1 || true endscript } |