diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/ejabberdctl.template | 8 |
2 files changed, 6 insertions, 4 deletions
@@ -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 376f03ad..b71531c1 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 |