[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 9bdfe97ff586978a1a7f36cdbfa5ea7f75e7cd70

[Micah Anderson]

The following commit has been merged in the master branch:
commit 3be4b941b02ca6cb9d6999ee4bf3748c62b6c0af
Author: Micah Anderson <micah at riseup.net>
Date:   Sat Apr 19 11:05:57 2008 -0400

    fix up initscript for puppetmaster to handle mongrel better

diff --git a/debian/changelog b/debian/changelog
index 2833cec..a4fb762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+puppet (0.24.4-5) unstable; urgency=low
+
+  * Fix missing --pidfile piece for mongrel startup and make 
+    stop consistent, thanks Bart Cortooms (Closes: #476840)
+
+ -- Micah Anderson <micah at debian.org>  Sat, 19 Apr 2008 11:03:35 -0400
+
 puppet (0.24.4-4) unstable; urgency=low
 
   * Create /etc/default/puppet and /etc/default/puppetmaster
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
index bc84641..7feeaf2 100644
--- a/debian/puppetmaster.init
+++ b/debian/puppetmaster.init
@@ -40,7 +40,7 @@ start_puppetmaster() {
 	NUMSTART=0
 	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
 	    start-stop-daemon --start --quiet --pidfile=/var/run/puppet/$NAME-$PORT.pid \
-		--startas $DAEMON -- $DAEMON_OPTS --masterport=$PORT
+		--startas $DAEMON -- $DAEMON_OPTS --masterport=$PORT --pidfile=/var/run/puppet/$NAME-$PORT.pid
 	    let PORT=PORT+1 
 	    let NUMSTART=NUMSTART+1 
 	done
@@ -53,9 +53,12 @@ start_puppetmaster() {
 stop_puppetmaster() {
     if [ "$SERVERTYPE" = "mongrel" ]
     then
-	for instance in $PUPPETMASTERS; do
-	    start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME-$instance.pid
-	    rm /var/run/puppet/$NAME-$instance.pid
+	NUMSTART=0
+	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
+	    start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME-$PORT.pid
+	    rm /var/run/puppet/$NAME-$PORT.pid
+	    let PORT=PORT+1 
+	    let NUMSTART=NUMSTART+1 
 	done
     else
 	start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME.pid

-- 
Puppet packaging for Debian