From cc5c3f7b2c760f2b861258f901085be95677fa3e Mon Sep 17 00:00:00 2001 From: Badlop Date: Fri, 27 Jan 2023 12:09:39 +0100 Subject: [PATCH] ejabberdctl: Don't use .../releases/COOKIE, it's no longer included And slightly clean the .erlang.cookie line This partially reverts 9c23a7dc3fc84281b1fda058db26ae1a309f7b17 --- .github/container/ejabberdctl.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/container/ejabberdctl.template b/.github/container/ejabberdctl.template index de3826a46..1f4d902ec 100755 --- a/.github/container/ejabberdctl.template +++ b/.github/container/ejabberdctl.template @@ -17,8 +17,8 @@ ERTS_VSN="{{erts_vsn}}" ERL="{{erl}}" IEX="{{bindir}}/iex" EPMD="{{epmd}}" -[ -z "$ERLANG_COOKIE" ] && ERL_OPTIONS="-setcookie $(cat "${SCRIPT_DIR%/*}/releases/COOKIE")" -[ -n "$ERLANG_COOKIE" ] && [ ! -f "$HOME"/.erlang.cookie ] && echo "$ERLANG_COOKIE" > "$HOME"/.erlang.cookie && chmod 400 "$HOME"/.erlang.cookie +COOKIE_FILE="$HOME"/.erlang.cookie +[ -n "$ERLANG_COOKIE" ] && [ ! -f "$COOKIE_FILE" ] && echo "$ERLANG_COOKIE" > "$COOKIE_FILE" && chmod 400 "$COOKIE_FILE" # check the proper system user is used case $(id -un) in