From 78b90e9300f8c1b72d950d9303213612ffd9830d Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Wed, 26 Nov 2008 18:02:41 +0000
Subject: [PATCH] * src/ejabberdctl.template: Fix detection of ejabberdctl.cfg
 path

SVN Revision: 1687
---
 ChangeLog                | 2 ++
 src/ejabberdctl.template | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 24085ba59..538b29dc5 100644
--- 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 376f03ad6..b71531c19 100644
--- 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