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

Merge pull request #12129 from zmstone/1208-default-license-conn-25 

refactor: update default enterprise license
This commit is contained in:
Zaiming (Stone) Shi 2023-12-08 21:01:04 +01:00 committed by GitHub
parent 1212ccc519 41679808fe
commit 5ad46ce077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_license/include/emqx_license.hrl
View File

@ -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"
).

10
apps/emqx_license/src/emqx_license_schema.erl
View File

@ -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="
>>.

4
changes/ee/feat-12129.en.md Normal file
View File

@ -0,0 +1,4 @@
Default license renewal.
Replaced old license issued in Jan 2023.
New license supports up to 25 concurrent connections.

8
rel/i18n/emqx_license_schema.hocon
View File

@ -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"""