diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/ejabberdctl.template | 24 |
2 files changed, 23 insertions, 6 deletions
@@ -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> * src/ejabberd_captcha.erl: XEP-158 (CAPTCHA Forms). diff --git a/src/ejabberdctl.template b/src/ejabberdctl.template index 32a31d105..5054d89b3 100644 --- a/src/ejabberdctl.template +++ b/src/ejabberdctl.template @@ -79,12 +79,24 @@ fi ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES $KERNEL_OPTS" # define additional environment variables -EJABBERDDIR=@LIBDIR@/ejabberd -EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin -EJABBERD_PRIV_PATH=$EJABBERDDIR/priv -EJABBERD_BIN_PATH=$EJABBERD_PRIV_PATH/bin -EJABBERD_SO_PATH=$EJABBERD_PRIV_PATH/lib -EJABBERD_MSGS_PATH=$EJABBERD_PRIV_PATH/msgs +if [ "$EJABBERDDIR" = "" ]; then + EJABBERDDIR=@LIBDIR@/ejabberd +fi +if [ "$EJABBERD_EBIN_PATH" = "" ]; then + EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin +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 SASL_LOG_PATH=$LOGS_DIR/sasl.log |