- allow to set node name

Changed files:
    ejabberd.init -> 1.9
    ejabberd.sysconfig -> 1.2

diff --git a/ejabberd.init b/ejabberd.init
index 1a29c2f3f8215a2c8d3cfade8e25219bf5f382ef..168df67a8a05c7545d96c802a9ba140380edf804 100644 (file)
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -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() {
        # 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 @@ case "$1" in
        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

diff --git a/ejabberd.sysconfig b/ejabberd.sysconfig
index a0f599dde1ec09e0dc2c9c63649828da656f80b1..9566f0d50ee7c93ceb3a9944e317ffb7a99708b5 100644 (file)
--- a/ejabberd.sysconfig
+++ b/ejabberd.sysconfig
@@ -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