diff --git a/apps/emqx_dashboard/i18n/emqx_dashboard_api_i18n.conf b/apps/emqx_dashboard/i18n/emqx_dashboard_api_i18n.conf index bd97b5b41..602af24c7 100644 --- a/apps/emqx_dashboard/i18n/emqx_dashboard_api_i18n.conf +++ b/apps/emqx_dashboard/i18n/emqx_dashboard_api_i18n.conf @@ -30,7 +30,7 @@ emqx_dashboard_api { license { desc { - en: """EMQX License. Community or enterprise""" + en: """EMQX License. opensource or enterprise""" zh: """EMQX 许可。开源版本 或者企业版""" } } diff --git a/apps/emqx_dashboard/src/emqx_dashboard_api.erl b/apps/emqx_dashboard/src/emqx_dashboard_api.erl index 1edd31bbf..ee288052e 100644 --- a/apps/emqx_dashboard/src/emqx_dashboard_api.erl +++ b/apps/emqx_dashboard/src/emqx_dashboard_api.erl @@ -196,8 +196,8 @@ field(license) -> {license, [ {edition, mk( - enum([community, enterprise]), - #{desc => ?DESC(license), example => community} + enum([opensource, enterprise]), + #{desc => ?DESC(license), example => opensource} )} ]}; field(version) -> diff --git a/apps/emqx_modules/src/emqx_telemetry.erl b/apps/emqx_modules/src/emqx_telemetry.erl index d3b8c6afe..8c7f01c23 100644 --- a/apps/emqx_modules/src/emqx_telemetry.erl +++ b/apps/emqx_modules/src/emqx_telemetry.erl @@ -326,7 +326,7 @@ get_telemetry(State0 = #state{node_uuid = NodeUUID, cluster_uuid = ClusterUUID}) } = get_rule_engine_and_bridge_info(), {State, [ {emqx_version, bin(emqx_app:get_release())}, - {license, [{edition, <<"community">>}]}, + {license, [{edition, <<"opensource">>}]}, {os_name, bin(get_value(os_name, OSInfo))}, {os_version, bin(get_value(os_version, OSInfo))}, {otp_version, bin(otp_version())}, diff --git a/apps/emqx_modules/src/emqx_telemetry_api.erl b/apps/emqx_modules/src/emqx_telemetry_api.erl index 46b3922b5..ce65f1052 100644 --- a/apps/emqx_modules/src/emqx_telemetry_api.erl +++ b/apps/emqx_modules/src/emqx_telemetry_api.erl @@ -106,7 +106,7 @@ fields(telemetry) -> map(), #{ desc => ?DESC(license), - example => #{edition => <<"community">>} + example => #{edition => <<"opensource">>} } )}, {os_name, diff --git a/rebar.config.erl b/rebar.config.erl index 006603441..5a73b2b93 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -207,7 +207,7 @@ profiles_dev() -> %% RelType: cloud (full size) %% PkgType: bin | pkg -%% Edition: ce (community) | ee (enterprise) +%% Edition: ce (opensource) | ee (enterprise) relx(Vsn, RelType, PkgType, Edition) -> [ {include_src, false}, diff --git a/scripts/relup-base-packages.sh b/scripts/relup-base-packages.sh index 0a910a5b4..db6a74485 100755 --- a/scripts/relup-base-packages.sh +++ b/scripts/relup-base-packages.sh @@ -15,7 +15,7 @@ export PROFILE case $PROFILE in "emqx") DIR='broker' - EDITION='community' + EDITION='opensource' ;; "emqx-enterprise") DIR='enterprise'