@@ -21,7 +21,13 @@ if [ -f /etc/sysconfig/puppetmaster ]; then fi PUPPETMASTER_OPTS="" +[ -n "$PUPPETMASTER_PID_DIR" ] || PUPPETMASTER_PID_DIR="/var/run/puppet/" [ -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}" @@ -36,8 +42,18 @@ start() { # Confirm the manifest exists if [ -r $PUPPETMASTER_MANIFEST ]; then - daemon $PUPPETMASTER $PUPPETMASTER_OPTS - RETVAL=$? + if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then + echo -n " (port " + for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do + echo -n "${PUPPETMASTER_PORTS[$i]}" + daemon $PUPPETMASTER $PUPPETMASTER_OPTS --masterport=${PUPPETMASTER_PORTS[$i]} --pidfile=$PUPPETMASTER_PID_DIR/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid + RETVAL=$? || $RETVAL + done + echo -n ")" + else + daemon $PUPPETMASTER $PUPPETMASTER_OPTS + RETVAL=$? + fi else failure $"Manifest does not exist: $PUPPETMASTER_MANIFEST" echo @@ -50,8 +66,18 @@ start() { stop() { echo -n $"Stopping puppetmaster: " - killproc $PUPPETMASTER - RETVAL=$? + if [ -n "$PUPPETMASTER_PORTS" ] && [ ${#PUPPETMASTER_PORTS[@]} -gt 1 ]; then + echo -n " (port " + for ((i=0; i<${#PUPPETMASTER_PORTS[@]}; i++)); do + echo -n "${PUPPETMASTER_PORTS[$i]}" + killproc -p $PUPPETMASTER_PID_DIR/puppetmaster.${PUPPETMASTER_PORTS[$i]}.pid $PUPPETMASTER + RETVAL=$? || $RETVAL + done + echo -n ")" + else + killproc $PUPPETMASTER + RETVAL=$? + fi echo [ $RETVAL -eq 0 ] && rm -f "$lockfile" return $RETVAL conf/redhat/server.init @@ -5,5 +5,26 @@ # Specify syslog to send log messages to the system log. #PUPPETMASTER_LOG=syslog +# You may specify an alternate port or an array of ports on which +# puppetmaster should listen. Default is: 8140 +# If you specify more than one port, the puppetmaster ist automatically +# started with the servertype set to mongrel. This might be interesting +# if you'd like to run your puppetmaster in a loadbalanced cluster. +# Please note: this won't setup nor start any loadbalancer. +# If you'd like to run puppetmaster with mongrel as servertype but only +# on one (specified) port, you have to add --servertype=mongrel to +# PUPPETMASTER_EXTRA_OPTS. +# Default: Empty (Puppetmaster isn't started with mongrel, nor on a +# specific port) +#PUPPETMASTER_PORTS="" +# Puppetmaster on a different port, run with standard webrick servertype +#PUPPETMASTER_PORTS="8141" +# Example with multiple ports which will start puppetmaster with mongrel +# as a servertype +#PUPPETMASTER_PORTS=( 18140 18141 18142 18143 ) + +# You may specify an alternate pid directory. +#PUPPETMASTER_PID_DIR=/var/run/puppet + # You may specify other parameters to the puppetmaster here #PUPPETMASTER_EXTRA_OPTS=--noca conf/redhat/server.sysconfig 40375a8fc34dbd85d87f507ba72c7394b25b7271 Marcel Haerry haerry@puzzle.ch http://github.com/duritong/puppet/commit/c202da54da409e08efb6225e2190d465bd481ca4 c202da54da409e08efb6225e2190d465bd481ca4 2008-07-29T01:03:07-07:00 2008-07-29T01:03:07-07:00 enhance redhat puppetmaster init.d script to easy start puppetmaster as a mongrel cluster If you'd like to run puppetmaster in a mongrel cluster you have to start X instances of puppetmaster with servertype set to mongrel. With this patch you can add more than one port to the sysconfig file and puppetmaster will automatically be started with severtype set to mongrel. You can now even specify an alternate port in the sysconfig file on which puppetmaster should be run as webrick based server. See sysconfig file for more documentation. 4d365fb8375a2345f31a3cabaefa3ec63111066c Marcel Haerry haerry@puzzle.ch