diff options
| -rw-r--r-- | conf/redhat/client.init | 7 | ||||
| -rw-r--r-- | conf/redhat/server.init | 11 |
2 files changed, 14 insertions, 4 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init index bccb45cb1..401151c83 100644 --- a/conf/redhat/client.init +++ b/conf/redhat/client.init @@ -67,6 +67,10 @@ rh_status() { status $statusopts $puppetd } +rh_status_q() { + rh_status >/dev/null 2>&1 +} + genconfig() { echo -n $"Generate configuration puppet: " $puppetd ${PUPPET_OPTS} ${PUPPET_EXTRA_OPTS} --genconfig @@ -86,7 +90,8 @@ case "$1" in reload ;; condrestart|try-restart) - [ -f "$pidfile" ] && restart + rh_status_q || exit 0 + restart ;; status) rh_status diff --git a/conf/redhat/server.init b/conf/redhat/server.init index 8f05387cc..4bc44b9fb 100644 --- a/conf/redhat/server.init +++ b/conf/redhat/server.init @@ -89,7 +89,7 @@ genconfig() { $PUPPETMASTER $PUPPETMASTER_OPTS --genconfig } -puppetmaster_status() { +rh_status() { if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do echo -en "Port ${PUPPETMASTER_PORTS[$i]}: " @@ -103,6 +103,10 @@ puppetmaster_status() { return $RETVAL } +rh_status_q() { + rh_status >/dev/null 2>&1 +} + case "$1" in start) start @@ -114,10 +118,11 @@ case "$1" in restart ;; condrestart) - [ -f "$lockfile" ] && restart + rh_status_q || exit 0 + restart ;; status) - puppetmaster_status + rh_status ;; genconfig) genconfig |