From 00d1e82b3ba9b8d9b5c5ba36bf22a23c7b6bfe21 Mon Sep 17 00:00:00 2001
From: Jeffrey C. Ollie <jcollie@fedoraproject.org>
Date: Jul 03 2006 14:59:29 +0000
Subject: Updated init script.


---

diff --git a/ejabberd.init b/ejabberd.init
index 6384a6d..d07c0ab 100644
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -9,6 +9,8 @@
 
 . /etc/rc.d/init.d/functions
 
+node=`hostname | cut -d. -f1`
+
 start() {
         echo -n $"Starting ejabberd: "
         daemon --user=ejabberd --check=ejabberd \
@@ -30,7 +32,7 @@ start() {
 stop() {
         # Stop daemons.
         echo -n "Shutting down ejabberd: "
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` stop" && success || failure
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node stop" && success || failure
         RETVAL=$?
         [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ejabberd
         echo
@@ -57,7 +59,7 @@ case "$1" in
         [ -f /var/lock/subsys/ejabberd ] && restart || :
         ;;
   status)
-        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` status"
+        runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd-@version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
         ;;
   *)
         echo "Usage: ejabberd {start|stop|restart|reload|condrestart|status}"
diff --git a/ejabberd.spec b/ejabberd.spec
index 86481dd..2f81ba6 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,6 +1,6 @@
 Name:           ejabberd
 Version:        1.1.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -150,6 +150,9 @@ rm -rf %{buildroot}
 %doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
 
 %changelog
+* Mon Jul 3 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-9
+- Updated init script - should hopefully fix some problems with status & stop commands.
+
 * Mon Jun 26 2006 Jeffrey C. Ollie <jeff@ocjtech.us> - 1.1.1-8
 - Bump release to that tagging works on FC-5.