* src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path

SVN Revision: 1687

diff --git a/ChangeLog b/ChangeLog
index 24085ba5910bd37b13faf9c07f27cb39cff9e955..538b29dc573b3bf8dd4f1f5525c80524a9a4c706 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2008-11-26  Badlop  <badlop@process-one.net>
 
+       * src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path
+
        * src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike)
        * src/mod_muc/mod_muc.erl: Announce disco#info disco#items
        * src/mod_proxy65/mod_proxy65_service.erl: No announce disco#items

diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template
index 376f03ad6b8b6fc493bb5d4a90decd6477b758c4..b71531c19daaeadd4a49a83b20f7d4599647e013 100644 (file)
--- a/src/ejabberdctl.template
+++ b/src/ejabberdctl.template
@@ -14,10 +14,6 @@ ERLANG_NODE=$NODE@$HOST
 ERL=@erl@
 INSTALLUSER=@installuser@
 
-# read custom configuration
-EJABBERDCTL_CONFIG_PATH=$ETCDIR/ejabberdctl.cfg
-[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
-
 # parse command line parameters
 ARGS=
 while [ $# -ne 0 ] ; do
@@ -42,6 +38,10 @@ fi
 if [ "$EJABBERD_CONFIG_PATH" = "" ] ; then
     EJABBERD_CONFIG_PATH=$ETCDIR/ejabberd.cfg
 fi
+if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ; then
+    EJABBERDCTL_CONFIG_PATH=$ETCDIR/ejabberdctl.cfg
+fi
+[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
 if [ "$LOGS_DIR" = "" ] ; then
     LOGS_DIR=@LOCALSTATEDIR@/log/ejabberd
 fi