diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2022-10-30 08:32:48 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2022-10-30 09:52:21 +0000 |
| commit | 1c620a3b22bfdfe960171ebd028d5307ee5449c8 (patch) | |
| tree | 18f32e434569478da21a54c02faef18988291938 /net-im/ejabberd/files/patch-ejabberdctl.template | |
| parent | www/ungoogled-chromium: update to 107.0.5304.87 (diff) | |
net-im/ejabberd: Update to 22.10
Diffstat (limited to 'net-im/ejabberd/files/patch-ejabberdctl.template')
| -rw-r--r-- | net-im/ejabberd/files/patch-ejabberdctl.template | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/net-im/ejabberd/files/patch-ejabberdctl.template b/net-im/ejabberd/files/patch-ejabberdctl.template index 04d51a3b1c30..f0923793c58b 100644 --- a/net-im/ejabberd/files/patch-ejabberdctl.template +++ b/net-im/ejabberd/files/patch-ejabberdctl.template @@ -1,18 +1,25 @@ ---- ejabberdctl.template.orig 2022-05-19 09:10:34 UTC +--- ejabberdctl.template.orig 2022-10-30 09:41:25 UTC +++ ejabberdctl.template -@@ -58,8 +58,8 @@ done +@@ -58,7 +58,7 @@ done # define ejabberd variables if not already defined from the command line : "${CONFIG_DIR:="{{config_dir}}"}" -: "${LOGS_DIR:="{{logs_dir}}"}" --: "${SPOOL_DIR:="{{spool_dir}}"}" +: ${LOGS_DIR:=/var/log/ejabberd} -+: ${SPOOL_DIR:=/var/spool/ejabberd} : "${EJABBERD_CONFIG_PATH:="$CONFIG_DIR/ejabberd.yml"}" : "${EJABBERDCTL_CONFIG_PATH:="$CONFIG_DIR/ejabberdctl.cfg"}" # Allows passing extra Erlang command-line arguments in vm.args file -@@ -83,7 +83,8 @@ if [ -n "$INET_DIST_INTERFACE" ] ; then - fi +@@ -67,7 +67,7 @@ done + [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" + [ -n "$ERLANG_NODE_ARG" ] && ERLANG_NODE="$ERLANG_NODE_ARG" + [ "$ERLANG_NODE" = "${ERLANG_NODE%.*}" ] && S="-s" +-: "${SPOOL_DIR:="{{spool_dir}}"}" ++: ${SPOOL_DIR:=/var/spool/ejabberd} + : "${EJABBERD_LOG_PATH:="$LOGS_DIR/ejabberd.log"}" + + # define erl parameters +@@ -84,7 +84,8 @@ fi + [ -n "$ERL_DIST_PORT" ] && ERLANG_OPTS="$ERLANG_OPTS -erl_epmd_port $ERL_DIST_PORT -start_epmd false" # if vm.args file exists in config directory, pass it to Erlang VM [ -f "$VMARGS" ] && ERLANG_OPTS="$ERLANG_OPTS -args_file $VMARGS" -ERL_LIBS='{{libdir}}' |