diff --git a/apps/emqx_license/include/emqx_license.hrl b/apps/emqx_license/include/emqx_license.hrl index 60febc4cd..ccbe67cd1 100644 --- a/apps/emqx_license/include/emqx_license.hrl +++ b/apps/emqx_license/include/emqx_license.hrl @@ -11,7 +11,7 @@ "\n" "========================================================================\n" "Using an evaluation license limited to ~p concurrent connections.\n" - "Visit https://emqx.com/apply-licenses/emqx to apply a new license.\n" + "Visit https://emqx.com/apply-licenses/emqx?version=5 to apply a new license.\n" "Or contact EMQ customer services via email contact@emqx.io\n" "========================================================================\n" ). @@ -20,7 +20,7 @@ "\n" "========================================================================\n" "License has been expired for ~p days.\n" - "Visit https://emqx.com/apply-licenses/emqx to apply a new license.\n" + "Visit https://emqx.com/apply-licenses/emqx?version=5 to apply a new license.\n" "Or contact EMQ customer services via email contact@emqx.io\n" "========================================================================\n" ). diff --git a/apps/emqx_license/src/emqx_license_schema.erl b/apps/emqx_license/src/emqx_license_schema.erl index aeced0ab0..7c8df0878 100644 --- a/apps/emqx_license/src/emqx_license_schema.erl +++ b/apps/emqx_license/src/emqx_license_schema.erl @@ -86,14 +86,12 @@ check_license_watermark(Conf) -> end. %% @doc The default license key. -%% This default license has 1000 connections limit. -%% It is issued on 2023-01-09 and valid for 5 years (1825 days) +%% This default license has 25 connections limit. +%% Issued on 2023-12-08 and valid for 5 years (1825 days) %% NOTE: when updating a new key, the schema doc in emqx_license_schema.hocon %% should be updated accordingly default_license() -> << - "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZ" - "GVmYXVsdAoyMDIzMDEwOQoxODI1CjEwMAo=.MEUCIG62t8W15g05f" - "1cKx3tA3YgJoR0dmyHOPCdbUxBGxgKKAiEAhHKh8dUwhU+OxNEaOn" - "8mgRDtiT3R8RZooqy6dEsOmDI=" + "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KdHJpYWwKMjAyMzEyMDgKMTgyNQoyNQo=." + "MEUCIE271MtH+4bb39OZKD4mvVkurwZ3LX44KUvuOxkbjQz2AiEAqL7BP44PMUS5z5SAN1M4y3v3h47J8qORAqcuetnyexw=" >>. diff --git a/changes/ee/feat-12129.en.md b/changes/ee/feat-12129.en.md new file mode 100644 index 000000000..378237a51 --- /dev/null +++ b/changes/ee/feat-12129.en.md @@ -0,0 +1,4 @@ +Default license renewal. + +Replaced old license issued in Jan 2023. +New license supports up to 25 concurrent connections. diff --git a/rel/i18n/emqx_license_schema.hocon b/rel/i18n/emqx_license_schema.hocon index e280af257..72f31266b 100644 --- a/rel/i18n/emqx_license_schema.hocon +++ b/rel/i18n/emqx_license_schema.hocon @@ -42,11 +42,11 @@ key_field.label: license_root.desc: """Defines the EMQX Enterprise license. +EMQX Enterprise is initially provided with a default trial license. +This license, issued in December 2023, is valid for a period of 5 years. +It supports up to 25 concurrent connections, catering to early-stage development and testing needs. -The default license has 100 connections limit, it is issued on 2023-01-09 and valid for 5 years (1825 days). - -EMQX comes with a default trial license. For production use, please -visit https://www.emqx.com/apply-licenses/emqx to apply.""" +For deploying EMQX Enterprise in a production environment, a different license is required. You can apply for a production license by visiting https://www.emqx.com/apply-licenses/emqx?version=5""" license_root.label: """License"""