yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4928 from z8674558/license-conf 

chore(bin/emqx): support license conf option
This commit is contained in:
Zaiming (Stone) Shi 2021-06-05 13:19:15 +02:00 committed by GitHub
parent 5052b26c7f ee48c961d0
commit b13051d94c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/emqx
View File

@ -199,15 +199,15 @@ generate_config() {
## changing the config 'log.rotation.size' ## changing the config 'log.rotation.size'
rm -rf "${RUNNER_LOG_DIR}"/*.siz rm -rf "${RUNNER_LOG_DIR}"/*.siz
## todo: include license conf option to hocon escript EMQX_LICENSE_CONF_OPTION=""
## EMQX_LICENSE_CONF_OPTION="" if [ "${EMQX_LICENSE_CONF:-}" != "" ]; then
## if [ "${EMQX_LICENSE_CONF:-}" != "" ]; then EMQX_LICENSE_CONF_OPTION="-c ${EMQX_LICENSE_CONF}"
## EMQX_LICENSE_CONF_OPTION="-i ${EMQX_LICENSE_CONF}" fi
## fi
set +e set +e
# disable shellcheck; let EMQX_LICENSE_CONF_OPTION split
# shellcheck disable=SC2086 # 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 # shellcheck disable=SC2181
RESULT=$? RESULT=$?
set -e set -e

2
rebar.config
View File

@ -56,7 +56,7 @@
, {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1 , {observer_cli, "1.6.1"} % NOTE: depends on recon 2.5.1
, {getopt, "1.0.1"} , {getopt, "1.0.1"}
, {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}} , {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"}}}
, {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.2.1"}}} , {emqx_http_lib, {git, "https://github.com/emqx/emqx_http_lib.git", {tag, "0.2.1"}}}
]}. ]}.