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

[Todd Zullinger]

The following commit has been merged in the upstream branch:
commit 3b548f412a2eed36fd06ceb5d23039c1e075de0f
Author: Matthias Saou <matthias at rpmforge.net>
Date:   Tue Oct 6 09:10:15 2009 -0400

    Fix #2699 - Use --masterport for PUPPET_PORT variable
    
    The sysconfig file shipped on Red Hat systems includes a PUPPET_PORT
    variable.  When set, this should specify the port used by puppet to
    connect to the puppetmaster.  The init script was incorrectly passing
    this argument via the --port option, which sets the port on which
    puppetd listens.
    
    Signed-off-by: Todd Zullinger <tmz at pobox.com>

diff --git a/conf/redhat/client.init b/conf/redhat/client.init
index a14444f..a5ac08d 100644
--- a/conf/redhat/client.init
+++ b/conf/redhat/client.init
@@ -25,7 +25,7 @@ RETVAL=0
 PUPPET_OPTS=""
 [ -n "${PUPPET_SERVER}" ] && PUPPET_OPTS="--server=${PUPPET_SERVER}"
 [ -n "$PUPPET_LOG" ] && PUPPET_OPTS="${PUPPET_OPTS} --logdest=${PUPPET_LOG}"
-[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --port=${PUPPET_PORT}"
+[ -n "$PUPPET_PORT" ] && PUPPET_OPTS="${PUPPET_OPTS} --masterport=${PUPPET_PORT}"
 
 # Figure out if the system just booted. Let's assume
 # boot doesn't take longer than 5 minutes

-- 
Puppet packaging for Debian