From 100477130bb26b52ec6ff1ada2febc2a23ad4aaa Mon Sep 17 00:00:00 2001 From: firest Date: Wed, 22 Mar 2023 15:51:03 +0800 Subject: [PATCH] fix: add back the support for the `WITH_EPMD` macro --- bin/emqx | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/bin/emqx b/bin/emqx index e2581e486..d7226f49a 100755 --- a/bin/emqx +++ b/bin/emqx @@ -517,12 +517,19 @@ case "$1" in ;; esac -EPMD_ARG="-start_epmd false -epmd_module ekka_epmd -proto_dist ekka" PROTO_DIST=$(grep -E '^[ \t]*cluster.proto_dist[ \t]*=[ \t]*' "$RUNNER_ETC_DIR/emqx.conf" 2> /dev/null | tail -1 | awk -F"= " '{print $NF}') -# this environment variable is required by ekka_dist module -# because proto_dist is overriden to ekka, and there is a lack of ekka_tls module -export EKKA_PROTO_DIST_MOD="${PROTO_DIST:-inet_tcp}" -if [ "$EKKA_PROTO_DIST_MOD" = 'inet_tls' ]; then + +if [ -n "$WITH_EPMD" ]; then + EPMD_ARG="-start_epmd true -proto_dist $PROTO_DIST" +else + EPMD_ARG="-start_epmd false -epmd_module ekka_epmd -proto_dist ekka" + + # this environment variable is required by ekka_dist module + # because proto_dist is overriden to ekka, and there is a lack of ekka_tls module + export EKKA_PROTO_DIST_MOD="${PROTO_DIST:-inet_tcp}" +fi + +if [ "$PROTO_DIST" = 'inet_tls' ]; then SSL_DIST_OPTFILE=${EMQX_SSL_DIST_OPTFILE:-"$RUNNER_ETC_DIR/ssl_dist.conf"} case "$SSL_DIST_OPTFILE" in *\ *)