SOURCES: ejabberd.sysconfig, ejabberd.init - allow to set node name

[arekm]

Author: arekm                        Date: Fri Feb 16 11:42:34 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- allow to set node name

---- Files affected:
SOURCES:
   ejabberd.sysconfig (1.1 -> 1.2) , ejabberd.init (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SOURCES/ejabberd.sysconfig
diff -u SOURCES/ejabberd.sysconfig:1.1 SOURCES/ejabberd.sysconfig:1.2
--- SOURCES/ejabberd.sysconfig:1.1	Tue Aug 31 22:59:11 2004
+++ SOURCES/ejabberd.sysconfig	Fri Feb 16 12:42:29 2007
@@ -1,6 +1,9 @@
 # Nice level for jabberd
 SERVICE_RUN_NICE_LEVEL="+0"
 
+# Node name
+#NODE="nodename"
+
 # uncomment this to allow more then 1024 connections (increases memory usage)
 #ERL_MAX_PORTS=32000
 

================================================================
Index: SOURCES/ejabberd.init
diff -u SOURCES/ejabberd.init:1.8 SOURCES/ejabberd.init:1.9
--- SOURCES/ejabberd.init:1.8	Sun Nov 12 23:26:53 2006
+++ SOURCES/ejabberd.init	Fri Feb 16 12:42:29 2007
@@ -14,6 +14,8 @@
 # Get service config - may override defaults
 [ -f /etc/sysconfig/ejabberd ] && . /etc/sysconfig/ejabberd
 
+[ -z "$NODENAME" ] && NODENAME=$(hostname)
+
 start() {
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/ejabberd ]; then
@@ -33,7 +35,7 @@
 	# Stop daemons.
 	if [ -f /var/lock/subsys/ejabberd ]; then
 		msg_stopping ejabberd
-		/usr/sbin/ejabberdctl ejabberd@`hostname` stop 2>/dev/null
+		/usr/sbin/ejabberdctl ejabberd@${NODENAME} stop 2>/dev/null
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
 			ok
@@ -63,7 +65,7 @@
 	if [ -f /var/lock/subsys/ejabberd ]; then
 		msg_reloading ejabberd
 		busy
-		/usr/sbin/ejabberdctl ejabberd@`hostname` restart
+		/usr/sbin/ejabberdctl ejabberd@${NODENAME} restart
 		RETVAL=$?
 		if [ $RETVAL -eq 0 ]; then
 		    ok
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ejabberd.sysconfig?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/ejabberd.init?r1=1.8&r2=1.9&f=u