summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorTodd Zullinger <tmz@pobox.com>2009-10-27 10:30:08 -0400
committerTodd Zullinger <tmz@pobox.com>2009-11-16 11:22:36 -0500
commit236bacc0a2c858ec25a48984e25834b91efc01c5 (patch)
treed0471f957ffa7a46542633d14ec0bee35bc3abe7 /conf
parent41f025c37d249f189d4b23022854edef345f8d27 (diff)
downloadpuppet-236bacc0a2c858ec25a48984e25834b91efc01c5.tar.gz
puppet-236bacc0a2c858ec25a48984e25834b91efc01c5.tar.xz
puppet-236bacc0a2c858ec25a48984e25834b91efc01c5.zip
conf/redhat: Prevent killproc from removing /usr/sbin/puppetmasterd
Mattias Saou ran into a serious bug cause by 9dff71 (Use -p option to killproc). The puppetmaster init script lacked a pidfile variable, which ended up with /usr/sbin/puppetmasterd being removed. Signed-off-by: Todd Zullinger <tmz@pobox.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/redhat/server.init1
1 files changed, 1 insertions, 0 deletions
diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 5505058ed..4f4420683 100644
--- a/conf/redhat/server.init
+++ b/conf/redhat/server.init
@@ -13,6 +13,7 @@ PATH=/usr/bin:/sbin:/bin:/usr/sbin
export PATH
lockfile=/var/lock/subsys/puppetmaster
+pidfile=/var/run/puppet/puppetmasterd.pid
# Source function library.
. /etc/rc.d/init.d/functions