Skip to content

Commit 122af79

Browse files
authored
move spool dir to make it fully configurable per ejabberdctl.cfg (#3863)
In the packaged rpm the spool dir is set to: ``` : "${SPOOL_DIR:="/opt/ejabberd/database/$ERLANG_NODE"}" ``` However, `$ERLANG_NODE` is effectively set later (now in line 67), which effectively makes spool dir always in `...../ejabberd@localhost`
1 parent 2ef71a6 commit 122af79

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ejabberdctl.template

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ done
5959
# define ejabberd variables if not already defined from the command line
6060
: "${CONFIG_DIR:="{{config_dir}}"}"
6161
: "${LOGS_DIR:="{{logs_dir}}"}"
62-
: "${SPOOL_DIR:="{{spool_dir}}"}"
6362
: "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}"
6463
: "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}"
6564
# Allows passing extra Erlang command-line arguments in vm.args file
@@ -68,6 +67,7 @@ done
6867
[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
6968
[ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG"
7069
[ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s"
70+
: "${SPOOL_DIR:="{{spool_dir}}"}"
7171
: "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}"
7272

7373
# define erl parameters

0 commit comments

Comments
 (0)