diff options
| author | Badlop <badlop@process-one.net> | 2008-11-26 18:02:41 +0000 |
|---|---|---|
| committer | Badlop <badlop@process-one.net> | 2008-11-26 18:02:41 +0000 |
| commit | 78b90e9300f8c1b72d950d9303213612ffd9830d (patch) | |
| tree | ef55b8c5804d174c23ea904af9234a0e4337275f /src/ejabberdctl.template | |
| parent | * src/mod_irc/mod_irc.erl: Announce disco#info (thanks to Spike) (diff) | |
* src/ejabberdctl.template: Fix detection of ejabberdctl.cfg path
SVN Revision: 1687
Diffstat (limited to 'src/ejabberdctl.template')
| -rw-r--r-- | src/ejabberdctl.template | 8 |
1 files changed, 4 insertions, 4 deletions
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 |