diff options
| author | Matthias Saou <matthias@rpmforge.net> | 2009-10-06 09:10:15 -0400 |
|---|---|---|
| committer | Todd Zullinger <tmz@pobox.com> | 2009-10-06 09:38:24 -0400 |
| commit | 3b548f412a2eed36fd06ceb5d23039c1e075de0f (patch) | |
| tree | b2428866826c86d694f68d964260a31bba8f4171 /conf | |
| parent | a75bf5015dfaf068e7574ae8192a6163949907d3 (diff) | |
| download | puppet-3b548f412a2eed36fd06ceb5d23039c1e075de0f.tar.gz puppet-3b548f412a2eed36fd06ceb5d23039c1e075de0f.tar.xz puppet-3b548f412a2eed36fd06ceb5d23039c1e075de0f.zip | |
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@pobox.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/redhat/client.init | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/redhat/client.init b/conf/redhat/client.init index a14444fe0..a5ac08d87 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 |