diff options
| author | Todd Zullinger <tmz@pobox.com> | 2010-07-12 10:01:57 -0400 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-13 23:09:37 -0700 |
| commit | 63bf037dc297c8cd59a02dc1fea0961014542344 (patch) | |
| tree | 81e90ce8e582f69510aa373776e1a5f4b44010ba | |
| parent | f72741f2165fcf6877c564f24d09e67c87180fb3 (diff) | |
| download | puppet-63bf037dc297c8cd59a02dc1fea0961014542344.tar.gz puppet-63bf037dc297c8cd59a02dc1fea0961014542344.tar.xz puppet-63bf037dc297c8cd59a02dc1fea0961014542344.zip | |
conf/redhat: Update conf/init files for single binary
| -rw-r--r-- | conf/redhat/client.init | 2 | ||||
| -rw-r--r-- | conf/redhat/puppet.conf | 2 | ||||
| -rw-r--r-- | conf/redhat/server.init | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init index 0c98383d5..04e0d27f2 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/puppetd.pid} +pidfile=${PIDFILE-/var/run/puppet/agent.pid} puppetd=${PUPPETD-/usr/sbin/puppetd} RETVAL=0 diff --git a/conf/redhat/puppet.conf b/conf/redhat/puppet.conf index d35593f12..47501a388 100644 --- a/conf/redhat/puppet.conf +++ b/conf/redhat/puppet.conf @@ -11,7 +11,7 @@ # The default value is '$confdir/ssl'. ssldir = $vardir/ssl -[puppetd] +[agent] # The file in which puppetd stores a list of the classes # associated with the retrieved configuratiion. Can be loaded in # the separate ``puppet`` executable using the ``--loadclasses`` diff --git a/conf/redhat/server.init b/conf/redhat/server.init index 4f4420683..3d2897d27 100644 --- a/conf/redhat/server.init +++ b/conf/redhat/server.init @@ -13,7 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin export PATH lockfile=/var/lock/subsys/puppetmaster -pidfile=/var/run/puppet/puppetmasterd.pid +pidfile=/var/run/puppet/master.pid # Source function library. . /etc/rc.d/init.d/functions |