25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00

Allow more environment variable overrides in ejabberdctl (EJAB-891)

SVN Revision: 1995
This commit is contained in:
Christophe Romain 2009-03-19 21:28:34 +00:00
parent b789ee630d
commit 1ac385f499
2 changed files with 23 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2009-03-19 Christophe Romain <christophe.romain@process-one.net>
* src/ejabberdctl.template: Allow more environment variable overrides
in ejabberdctl (thanks to Brian Cully)(EJAB-891)
2009-03-13 Evgeniy Khramtsov <ekhramtsov@process-one.net> 2009-03-13 Evgeniy Khramtsov <ekhramtsov@process-one.net>
* src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms). * src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms).

View File

@ -79,12 +79,24 @@ fi
ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $KERNEL_OPTS" ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $KERNEL_OPTS"
# define additional environment variables # define additional environment variables
EJABBERDDIR=@LIBDIR@/ejabberd if [ "$EJABBERDDIR" = "" ]; then
EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin EJABBERDDIR=@LIBDIR@/ejabberd
EJABBERD_PRIV_PATH=$EJABBERDDIR/priv fi
EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin if [ "$EJABBERD_EBIN_PATH" = "" ]; then
EJABBERD_SO_PATH=$EJABBERD_PRIV_PATH/lib EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
EJABBERD_MSGS_PATH=$EJABBERD_PRIV_PATH/msgs fi
if [ "$EJABBERD_PRIV_PATH" = "" ]; then
EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
fi
if [ "$EJABBRD_BIN_PATH" = "" ]; then
EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin
fi
if [ "$EJABBERD_SO_PATH" = "" ]; then
EJABBERD_SO_PATH=$EJABBERD_PRIV_PATH/lib
fi
if [ "$EJABBERD_MSGS_PATH" = "" ]; then
EJABBERD_MSGS_PATH=$EJABBERD_PRIV_PATH/msgs
fi
EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
SASL_LOG_PATH=$LOGS_DIR/sasl.log SASL_LOG_PATH=$LOGS_DIR/sasl.log