[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[Todd Zullinger]

The following commit has been merged in the upstream branch:
commit 236bacc0a2c858ec25a48984e25834b91efc01c5
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Oct 27 10:30:08 2009 -0400

    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 at pobox.com>

diff --git a/conf/redhat/server.init b/conf/redhat/server.init
index 5505058..4f44206 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

-- 
Puppet packaging for Debian