diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-17 23:00:49 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-04-17 23:00:49 +0000 |
| commit | 449f6626904cbf4165a3e481e8b9c7433be997d8 (patch) | |
| tree | 5be5c6dca67f2419c362134c0b33916a9969d8d5 | |
| parent | 21584a988abd490f9b32949e6ff0f6a8a8b9c364 (diff) | |
| download | puppet-449f6626904cbf4165a3e481e8b9c7433be997d8.tar.gz puppet-449f6626904cbf4165a3e481e8b9c7433be997d8.tar.xz puppet-449f6626904cbf4165a3e481e8b9c7433be997d8.zip | |
Fix handling of run files so services can't be started twice (reported with patch by soul916 at gmail.com)
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1116 980ebf18-57e1-0310-9a29-db15c13687c0
| -rw-r--r-- | conf/redhat/client.init | 2 | ||||
| -rw-r--r-- | conf/redhat/puppetd.conf | 2 | ||||
| -rw-r--r-- | conf/redhat/puppetmasterd.conf | 2 | ||||
| -rw-r--r-- | conf/redhat/server.init | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init index 41c09dfcf..5b2e7fc02 100644 --- a/conf/redhat/client.init +++ b/conf/redhat/client.init @@ -15,7 +15,7 @@ export PATH [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet lockfile=${LOCKFILE-/var/lock/subsys/puppet} -pidfile=${PIDFILE-/var/run/puppet/puppet.pid} +pidfile=${PIDFILE-/var/run/puppet.pid} puppetd=${PUPPETD-/usr/sbin/puppetd} RETVAL=0 diff --git a/conf/redhat/puppetd.conf b/conf/redhat/puppetd.conf index 6891daec4..521e3a38b 100644 --- a/conf/redhat/puppetd.conf +++ b/conf/redhat/puppetd.conf @@ -2,4 +2,4 @@ # Make sure all log messages are sent to the right directory # This directory must be writable by the puppet user logdir=/var/log/puppet -rundir=/var/run/puppet +rundir=/var/run diff --git a/conf/redhat/puppetmasterd.conf b/conf/redhat/puppetmasterd.conf index 1eeeab542..9cf6c3e5d 100644 --- a/conf/redhat/puppetmasterd.conf +++ b/conf/redhat/puppetmasterd.conf @@ -2,4 +2,4 @@ # Make sure all log messages are sent to the right directory # This directory must be writable by the puppet user logdir=/var/log/puppet -rundir=/var/run/puppet +rundir=/var/run diff --git a/conf/redhat/server.init b/conf/redhat/server.init index f82840e46..b3af45db8 100644 --- a/conf/redhat/server.init +++ b/conf/redhat/server.init @@ -37,7 +37,7 @@ start() { # Confirm the manifest exists if [ -r $PUPPETMASTER_MANIFEST ]; then - $PUPPETMASTER $PUPPETMASTER_OPTS + daemon $PUPPETMASTER $PUPPETMASTER_OPTS RETVAL=$? else failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST" @@ -45,8 +45,6 @@ start() { return 1 fi [ $RETVAL -eq 0 ] && touch "$lockfile" - [ $RETVAL -eq 0 ] && echo_success - [ $RETVAL -ne 0 ] && echo_failure echo return $RETVAL } |