[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 70c293abd1b1e506343223515a32e34a15de1a12
Author: Ken Barber <ken at bob.sh>
Date:   Fri Jul 2 13:33:02 2010 +0100

    Fix for environments in startup script.
    - Dropped the forced --manifest switch in the
      suse startup script to allow for environments
      to re-define this. Otherwise, environments will
      not work as puppet override configuration with
      command line arguments.

diff --git a/conf/suse/server.init b/conf/suse/server.init
index 2649af5..cc4194b 100644
--- a/conf/suse/server.init
+++ b/conf/suse/server.init
@@ -39,16 +39,16 @@ if [ -f /etc/sysconfig/puppetmaster ]; then
     . /etc/sysconfig/puppetmaster
 fi
 
-[ -z "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_MANIFEST=/etc/puppet/manifests/site.pp
-[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
-PUPPETMASTER_OPTS="
-    --manifest=$PUPPETMASTER_MANIFEST \
-    --logdest=${PUPPETMASTER_LOG} \
+PUPPETMASTER_OPTS=""
+[ -n "$PUPPETMASTER_MANIFEST" ] && PUPPETMASTER_OPTS="--manifest=${PUPPETMASTER_MANIFEST}"
+if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then
+    PUPPETMASTER_OPTS="$PUPPETMASTER_OPTS --servertype=mongrel"
+elif [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -eq 1 ]; then
+    PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --masterport=${PUPPETMASTER_PORTS[0]}"
+fi
+[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest ${PUPPETMASTER_LOG}"
+PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \
     ${PUPPETMASTER_EXTRA_OPTS}"
-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}"
 
 prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog

-- 
Puppet packaging for Debian