File puppet-2.6.6-init.diff of Package puppet

Index: conf/suse/client.init
===================================================================
--- conf/suse/client.init.orig
+++ conf/suse/client.init
@@ -17,7 +17,7 @@
 # Should-Start: puppet
 # Required-Stop: $local_fs $remote_fs $network $syslog
 # Should-Stop: puppet
-# Default-Start: 3 4 5
+# Default-Start: 3 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppet
 # Description: Enables periodic system configuration checks through puppet.
@@ -33,14 +33,19 @@
 #      rc_exit          exit appropriate to overall rc status
 [ -f /etc/rc.status ] && . /etc/rc.status
 [ -f /etc/sysconfig/puppet ] && . /etc/sysconfig/puppet
-lockfile=${LOCKFILE-/var/lock/subsys/puppet}
-pidfile=${PIDFILE-/var/run/puppet.pid}
-puppetd=${PUPPETD-/usr/sbin/puppetd}
-
-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}"
+lockfile=/var/lock/subsys/puppet
+pidfile=/var/run/puppet.pid
+puppetd=/usr/sbin/puppetd
+
+[ -z "$PUPPET_LOG" ] && PUPPET_LOG="/var/log/puppet/puppet.log"
+[ -z "$PUPPET_SERVER" ] && PUPPET_SERVER="puppet"
+[ -z "$PUPPET_PORT" ] && PUPPET_PORT="8140"
+
+PUPPET_OPTS="
+        --logdest=$PUPPET_LOG \
+        --masterport=$PUPPET_PORT \
+        --server=$PUPPET_SERVER \
+        $PUPPET_EXTRA_OPTS"
 
 # First reset status of this service
 rc_reset
@@ -76,7 +81,7 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT $puppetd && rm -f ${lockfile} ${pidfile}
+        killproc $puppetd && rm -f ${lockfile} ${pidfile}
 
         # Remember status and be verbose
         rc_status -v
Index: conf/suse/server.init
===================================================================
--- conf/suse/server.init.orig
+++ conf/suse/server.init
@@ -15,7 +15,7 @@
 # Should-Start: puppetmaster
 # Required-Stop: $local_fs $remote_fs $network $syslog
 # Should-Stop: puppetmaster
-# Default-Start: 3 4 5
+# Default-Start: 3 5
 # Default-Stop: 0 1 2 6
 # Short-Description: puppetmaster
 # Description: Server for the puppet system management tool.
@@ -30,14 +30,14 @@
 #      rc_reset         clear local rc status (overall remains)
 #      rc_exit          exit appropriate to overall rc status
 
-lockfile=/var/lock/subsys/puppetmaster
+lockfile=/var/lock/subsys/puppetmasterd
 pidfile=/var/run/puppet/puppetmasterd.pid
 
 # Source function library.
 [ -f /etc/rc.status ] && . /etc/rc.status
 
-if [ -f /etc/sysconfig/puppetmaster ]; then
-    . /etc/sysconfig/puppetmaster
+if [ -f /etc/sysconfig/puppetmasterd ]; then
+    . /etc/sysconfig/puppetmasterd
 fi
 
 PUPPETMASTER_OPTS=""
@@ -100,7 +100,7 @@ case "$1" in
         ## Stop daemon with killproc(8) and if this fails
         ## set echo the echo return value.
 
-        killproc -QUIT $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
+        killproc $PUPPETMASTER && rm -f ${lockfile} ${pidfile}
 
         # Remember status and be verbose
         rc_status -v