server.init in puppet-0.13.1

- old
+ new

@@ -19,11 +19,11 @@
 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/puppetmaster.log"
+[ -z "$PUPPETMASTER_LOG" ] && PUPPETMASTER_LOG="/var/log/puppet/puppetmaster.log"
 PUPPETMASTER_OPTS="
 	--manifest=$PUPPETMASTER_MANIFEST \
 	--logdest=${PUPPETMASTER_LOG} \
 	${PUPPETMASTER_EXTRA_OPTS}"
 
@@ -31,11 +31,11 @@
 
 prog=puppetmasterd
 PUPPETMASTER=/usr/sbin/$prog
 
 start() {
-	echo -n $"Starting $prog: "
+	echo -n $"Starting puppetmaster: "
 
 	# Confirm the manifest exists
 	if [ -r $PUPPETMASTER_MANIFEST ]; then
 		$PUPPETMASTER $PUPPETMASTER_OPTS
 		RETVAL=$?
@@ -50,10 +50,10 @@
 	echo
 	return $RETVAL
 }
 
 stop() {
-	echo -n  $"Stopping $prog: "
+	echo -n  $"Stopping puppetmaster: "
 	killproc $PUPPETMASTER
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f "$lockfile"
 	return $RETVAL