rpms/ejabberd/FC-5 ejabberd.init,1.1,1.2 ejabberd.spec,1.2,1.3
Jeffrey C. Ollie (jcollie)
fedora-extras-commits at redhat.com
Mon Jul 3 15:00:38 UTC 2006
Author: jcollie
Update of /cvs/extras/rpms/ejabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8216
Modified Files:
ejabberd.init ejabberd.spec
Log Message:
Updated init script.
Index: ejabberd.init
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ejabberd.init 23 Jun 2006 12:40:03 -0000 1.1
+++ ejabberd.init 3 Jul 2006 15:00:37 -0000 1.2
@@ -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 @@
stop() {
# Stop daemons.
echo -n "Shutting down ejabberd: "
- runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at 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- at 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 @@
[ -f /var/lock/subsys/ejabberd ] && restart || :
;;
status)
- runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@`hostname -s` status"
+ runuser -s /bin/bash - ejabberd -c "erl -pa @libdir@/ejabberd- at version@/ebin -noinput -sname ejabberdctl -s ejabberd_ctl -extra ejabberd@$node status"
;;
*)
echo "Usage: ejabberd {start|stop|restart|reload|condrestart|status}"
Index: ejabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/ejabberd/FC-5/ejabberd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ejabberd.spec 26 Jun 2006 13:50:36 -0000 1.2
+++ ejabberd.spec 3 Jul 2006 15:00:37 -0000 1.3
@@ -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 @@
%doc ChangeLog COPYING TODO doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
%changelog
+* Mon Jul 3 2006 Jeffrey C. Ollie <jeff at 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 at ocjtech.us> - 1.1.1-8
- Bump release to that tagging works on FC-5.
More information about the fedora-extras-commits
mailing list