mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-28 16:34:13 +01:00
Container: Apply commit 122af79
move spool dir to make it fully configurable per ejabberdctl.cfg (#3863)
This commit is contained in:
parent
021f0be119
commit
66645baa75
2
.github/container/ejabberdctl.template
vendored
2
.github/container/ejabberdctl.template
vendored
@ -60,7 +60,6 @@ done
|
|||||||
# define ejabberd variables if not already defined from the command line
|
# define ejabberd variables if not already defined from the command line
|
||||||
: "${CONFIG_DIR:="{{config_dir}}"}"
|
: "${CONFIG_DIR:="{{config_dir}}"}"
|
||||||
: "${LOGS_DIR:="{{logs_dir}}"}"
|
: "${LOGS_DIR:="{{logs_dir}}"}"
|
||||||
: "${SPOOL_DIR:="{{spool_dir}}"}"
|
|
||||||
: "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
|
: "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
|
||||||
: "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
|
: "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
|
||||||
# Allows passing extra Erlang command-line arguments in vm.args file
|
# Allows passing extra Erlang command-line arguments in vm.args file
|
||||||
@ -69,6 +68,7 @@ done
|
|||||||
[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
|
[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
|
||||||
[ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
|
[ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
|
||||||
[ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
|
[ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
|
||||||
|
: "${SPOOL_DIR:="{{spool_dir}}"}"
|
||||||
: "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
|
: "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
|
||||||
|
|
||||||
# define erl parameters
|
# define erl parameters
|
||||||
|
Loading…
Reference in New Issue
Block a user