From d14b90ef2efaee901a80ad0c0f425bb195fad4c9 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Tue, 9 Mar 2021 15:32:26 +0100 Subject: [PATCH] chore(build): Feed relx overlay var from rebar.config.erl --- rebar.config.erl | 9 +++++++++ vars/vars-cloud.config | 1 - vars/vars-edge.config | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rebar.config.erl b/rebar.config.erl index 56949a409..b73e9522d 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -136,11 +136,20 @@ relx(Vsn, RelType, PkgType) -> , {release, {emqx, Vsn}, relx_apps(RelType)} , {overlay, relx_overlay(RelType)} , {overlay_vars, [ {built_on_arch, rebar_utils:get_arch()} + , {emqx_description, emqx_description(RelType)} , overlay_vars_rel(RelType) , overlay_vars_pkg(PkgType) ]} ]. +emqx_description(cloud) -> + case is_enterprise() of + true -> "EMQ X Enterprise"; + false -> "EMQ X Broker" + end; +emqx_description(edge) -> + "EMQ X Edge". + overlay_vars_rel(cloud) -> "vars/vars-cloud.config"; overlay_vars_rel(edge) -> "vars/vars-edge.config". diff --git a/vars/vars-cloud.config b/vars/vars-cloud.config index 8362bcf56..a898927d7 100644 --- a/vars/vars-cloud.config +++ b/vars/vars-cloud.config @@ -5,4 +5,3 @@ {enable_plugin_emqx_retainer, true}. {enable_plugin_emqx_telemetry, true}. {vm_args_file, "vm.args"}. -{emqx_description, "EMQ X Broker"}. \ No newline at end of file diff --git a/vars/vars-edge.config b/vars/vars-edge.config index bc36db504..2df294838 100644 --- a/vars/vars-edge.config +++ b/vars/vars-edge.config @@ -5,4 +5,3 @@ {enable_plugin_emqx_retainer, true}. {enable_plugin_emqx_telemetry, true}. {vm_args_file, "vm.args.edge"}. -{emqx_description, "EMQ X Edge"}.