diff options
| author | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-08-03 19:26:57 +0000 |
|---|---|---|
| committer | lutter <lutter@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-08-03 19:26:57 +0000 |
| commit | 81d690ad006248b6194f380d0dc21f6124199557 (patch) | |
| tree | 778b0b959bcbdf3b0dd5f56803a83b975087f163 /conf | |
| parent | 36a3e4a38c50c1dff621a1ddf9a362a670681768 (diff) | |
| download | puppet-81d690ad006248b6194f380d0dc21f6124199557.tar.gz puppet-81d690ad006248b6194f380d0dc21f6124199557.tar.xz puppet-81d690ad006248b6194f380d0dc21f6124199557.zip | |
Do not set any options if they aren't set in /etc/sysconfig/puppetmaster - otherwise we clobber settings from puppet.conf
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2734 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/redhat/server.init | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/conf/redhat/server.init b/conf/redhat/server.init index 6afcfa98b..b64622140 100644 --- a/conf/redhat/server.init +++ b/conf/redhat/server.init @@ -20,11 +20,10 @@ 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}" +[ -n "$PUPPETMASTER_LOG" ] && PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} --logdest=${PUPPETMASTER_LOG}" +PUPPETMASTER_OPTS="${PUPPETMASTER_OPTS} \ ${PUPPETMASTER_EXTRA_OPTS}" RETVAL=0 |