Applying some RPM work from earlier in the week. (and testing svn access)

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@7924 b35dd754-fafc-0310-a699-88a17e54d16e

src/bin/extra/openfire-sysconfig

@@ -5,3 +5,7 @@
 # If there is a different user you would like to run openfire as,
 # change the following line
 #OPENFIRE_USER="jive"
+
+# If you wish to change the location of the openfire pid file,
+# change the following line
+#OPENFIRE_PIDFILE="/var/run/openfired.pid"

src/bin/extra/openfired

-#!/bin/sh
-
-# openfired	stops and starts the openfire XMPP service
+#!/bin/bash
+#
+# openfired	Stops and starts the Openfire XMPP service.
 #
 # chkconfig: 2345 99 1
-# description: Used to start and stop the openfire XMPP server
+# description: Openfire is an XMPP server, which is a server that facilitates \
+#              XML based communication, such as chat.
+# config: /opt/openfire/conf/openfire.xml
+# pidfile: /var/run/openfired.pid
 # 
-# Script used to start openfire as daemon
-# The script has currently been tested on Redhat Fedora Core 3,
+# This script has currently been tested on Redhat and CentOS based systems,
 # but should theoretically work on most UNIX like systems
 #
-# before running this script make sure $OPENFIRE_HOME/bin/openfire.sh is
+# Before running this script make sure $OPENFIRE_HOME/bin/openfire.sh is
 # executable by the user you want to run openfire as
 # (chmod +x $OPENFIRE_HOME/bin/openfire.sh)
 #
@@ -24,11 +26,14 @@
 #
 
 # Get config.
-test -f /etc/sysconfig/openfire && . /etc/sysconfig/openfire
+[ -f /etc/sysconfig/openfire ] && . /etc/sysconfig/openfire
 
 # If openfire user is not set in sysconfig, set to jive.
 [ -z "$OPENFIRE_USER" ] && OPENFIRE_USER=jive
 
+# If pid file path is not set in sysconfig, set to /var/run/openfired.pid.
+[ -z "$OPENFIRE_PIDFILE" ] && OPENFIRE_PIDFILE=/var/run/openfired.pid
+
 # -----------------------------------------------------------------
 
 # If a openfire home variable has not been specified, try to determine it
@@ -44,23 +49,42 @@ if [ ! $OPENFIRE_HOME ]; then
 	fi
 fi
 
+RETVAL=0
+prog="openfired"
 
-function execCommand() {
+start() {
 	OLD_PWD=`pwd`
 	cd $OPENFIRE_HOME/bin
-	CMD="./openfire.sh $1"
-	su -c "$CMD" $OPENFIRE_USER &
+
+        # Start daemons.
+        echo -n $"Starting $prog: "
+
+	CMD=./openfire.sh
+	su -s /bin/bash -c "$CMD" $OPENFIRE_USER &
+	RETVAL=$?
+
+	if [ $RETVAL -eq 0 -a ! -z "$OPENFIRE_PIDFILE" ]; then
+		echo $! > $OPENFIRE_PIDFILE
+	fi
+
+	echo
+
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openfired
+
 	sleep 1 # allows prompt to return
 	cd $OLD_PWD
 }
 
+stop() {
+	# Stop daemons.
+	echo -n $"Shutting down $prog: "
 
-start() {
-	execCommand "start"
-}
+	[ -f $OPENFILE_PIDFILE ] && kill `cat $OPENFIRE_PIDFILE`
+	RETVAL=$?
+	echo
 
-stop() {
-	execCommand "stop"
+	[ $RETVAL -eq 0 -a -f $OPENFIRE_PIDFILE ] && rm -f $OPENFIRE_PIDFILE
+	[ $RETVAL -eq 0 -a -f /var/lock/subsys/openfired ] && rm -f /var/lock/subsys/openfired
 }