diff --git a/bin/emqx b/bin/emqx index 413501a04..96f6ec42f 100755 --- a/bin/emqx +++ b/bin/emqx @@ -199,15 +199,15 @@ generate_config() { ## changing the config 'log.rotation.size' rm -rf "${RUNNER_LOG_DIR}"/*.siz - ## todo: include license conf option to hocon escript - ## EMQX_LICENSE_CONF_OPTION="" - ## if [ "${EMQX_LICENSE_CONF:-}" != "" ]; then - ## EMQX_LICENSE_CONF_OPTION="-i ${EMQX_LICENSE_CONF}" - ## fi + EMQX_LICENSE_CONF_OPTION="" + if [ "${EMQX_LICENSE_CONF:-}" != "" ]; then + EMQX_LICENSE_CONF_OPTION="-c ${EMQX_LICENSE_CONF}" + fi set +e + # disable shellcheck; let EMQX_LICENSE_CONF_OPTION split # shellcheck disable=SC2086 - HOCON_OUTPUT="$("$ERTS_PATH"/escript "$RUNNER_ROOT_DIR"/bin/hocon -s emqx_schema -c "$RUNNER_ETC_DIR"/emqx.conf -d "$RUNNER_DATA_DIR"/configs generate)" + HOCON_OUTPUT="$("$ERTS_PATH"/escript "$RUNNER_ROOT_DIR"/bin/hocon -s emqx_schema -c "$RUNNER_ETC_DIR"/emqx.conf $EMQX_LICENSE_CONF_OPTION -d "$RUNNER_DATA_DIR"/configs generate)" # shellcheck disable=SC2181 RESULT=$? set -e diff --git a/rebar.config b/rebar.config index cf2a46aac..2c9633e7c 100644 --- a/rebar.config +++ b/rebar.config @@ -56,7 +56,7 @@ , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1 , {getopt, "1.0.1"} , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}} - , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.4.0"}}} + , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.5.0"}}} ]}. {xref_ignores,