From 4ddb8757d699114e84031f6aa8007ea80a51c66e Mon Sep 17 00:00:00 2001 From: Will Holley Date: Wed, 11 Dec 2019 14:56:27 +0000 Subject: Remsh: attempt to auto-locate Erlang cookie Attempts to find the Erlang cookie from ERL_FLAGS or the standard vm.args location. If not present, fall back to the default (monster). --- rel/overlay/bin/remsh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/rel/overlay/bin/remsh b/rel/overlay/bin/remsh index 2d28a8c85..2ac421b07 100755 --- a/rel/overlay/bin/remsh +++ b/rel/overlay/bin/remsh @@ -23,8 +23,18 @@ BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin PROGNAME=${0##*/} VERBOSE="" NODE="couchdb@127.0.0.1" -COOKIE=monster LHOST=127.0.0.1 +VM_ARGS=$COUCHDB_BIN_DIR/../etc/vm.args + +# If present, extract cookie from ERL_FLAGS +# This is used by the CouchDB Dockerfile and Helm chart +COOKIE=$(echo "$ERL_FLAGS" | sed 's/^.*setcookie \([^ ][^ ]*\).*$/\1/g') +if test -f "$VM_ARGS"; then +# else attempt to extract from vm.args + VM_ARGS_COOKIE=$(awk '$1=="-setcookie"{print $2}' "$VM_ARGS") + COOKIE="${COOKIE:-$VM_ARGS_COOKIE}" +fi +COOKIE="${COOKIE:-monster}" printHelpAndExit() { echo "Usage: ${PROGNAME} [OPTION]... [-- ]" -- cgit v1.2.1