diff options
| author | Ken Barber <ken@bob.sh> | 2010-07-02 13:33:02 +0100 |
|---|---|---|
| committer | Markus Roberts <Markus@reality.com> | 2010-07-09 09:18:48 -0700 |
| commit | 2353115c79f043aced921cf6b0624bad59a41b82 (patch) | |
| tree | 4f8506b27e0fd99a89f681f5e2518f03fe766922 /conf | |
| parent | cfca62b3896894bd8132f034a1626d589b3ef46b (diff) | |
| download | puppet-2353115c79f043aced921cf6b0624bad59a41b82.tar.gz puppet-2353115c79f043aced921cf6b0624bad59a41b82.tar.xz puppet-2353115c79f043aced921cf6b0624bad59a41b82.zip | |
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.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/suse/server.init | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/conf/suse/server.init b/conf/suse/server.init index 2649af506..cc4194b62 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 |