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

[Micah Anderson]

The following commit has been merged in the master branch:
commit 6eb302cd6cb13637fbc818ec0ec3d70cf92d18e7
Author: Micah Anderson <micah at riseup.net>
Date:   Fri May 9 13:39:17 2008 -0400

    Fix variable name in /etc/default/puppetmaster comments
    Fix incorrect port increment in puppetmaster initscript when mongrel
    is used, thanks Francois Deppierraz (Closes: #480263)

diff --git a/debian/changelog b/debian/changelog
index 16f2f54..fdb3503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ puppet (0.24.4-7) unstable; urgency=low
   
   * Update emacs-mode with changes cherry-picked from rra's repository
   * Fix typo in puppetmaster.init (Closes: #480019)
+  * Fix variable name in /etc/default/puppetmaster comments
+  * Fix incorrect port increment in puppetmaster initscript when mongrel
+    is used, thanks Francois Deppierraz (Closes: #480263)
   
  -- Micah Anderson <micah at debian.org>>  Sat, 03 May 2008 16:18:32 -0400
   
diff --git a/debian/puppetmaster.default b/debian/puppetmaster.default
index c239e90..f74ca77 100644
--- a/debian/puppetmaster.default
+++ b/debian/puppetmaster.default
@@ -22,7 +22,7 @@ SERVERTYPE=webrick
 PUPPETMASTERS=1
 
 # What port should the puppetmaster listen on (default: 18140). If 
-# NUMBER_OF_MASTERS is set to a number greater than 1, then the port
+# PUPPETMASTERS is set to a number greater than 1, then the port
 # for the first puppetmaster will be set to the below port, and further
 # instances will be incremented by one
 
diff --git a/debian/puppetmaster.init b/debian/puppetmaster.init
index 075dd47..f1d0076 100644
--- a/debian/puppetmaster.init
+++ b/debian/puppetmaster.init
@@ -38,10 +38,11 @@ start_puppetmaster() {
     then
 	DAEMON_OPTS="$DAEMON_OPTS --servertype=mongrel"
 	NUMSTART=0
+	STARTPORT=$PORT
 	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-	    start-stop-daemon --start --quiet --pidfile=/var/run/puppet/$NAME-$PORT.pid \
-		--startas $DAEMON -- $DAEMON_OPTS --masterport=$PORT --pidfile=/var/run/puppet/$NAME-$PORT.pid
-	    PORT=$(($PORT + 1))
+	    start-stop-daemon --start --quiet --pidfile=/var/run/puppet/$NAME-$STARTPORT.pid \
+		--startas $DAEMON -- $DAEMON_OPTS --masterport=$STARTPORT --pidfile=/var/run/puppet/$NAME-$STARTPORT.pid
+	    STARTPORT=$(($STARTPORT + 1))
 	    NUMSTART=$(($NUMSTART + 1))
 	done
     else
@@ -54,10 +55,11 @@ stop_puppetmaster() {
     if [ "$SERVERTYPE" = "mongrel" ]
     then
 	NUMSTART=0
+	STOPPORT=$PORT
 	while [ $NUMSTART -lt $PUPPETMASTERS ]; do 
-	    start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME-$PORT.pid
-	    rm /var/run/puppet/$NAME-$PORT.pid
-	    PORT=$(($PORT + 1))
+	    start-stop-daemon --stop --quiet --pidfile /var/run/puppet/$NAME-$STOPPORT.pid
+	    rm /var/run/puppet/$NAME-$STOPPORT.pid
+	    STOPPORT=$(($STOPPORT + 1))
 	    NUMSTART=$(($NUMSTART + 1))
 	done
     else

-- 
Puppet packaging for Debian