From 21f89fd83e4f89e6d68de83749c3b14fab32590e Mon Sep 17 00:00:00 2001 From: Thales Macedo Garitezi Date: Wed, 14 Sep 2022 17:00:21 -0300 Subject: [PATCH] chore(license): delete default config and add info to i18n --- lib-ee/emqx_license/etc/emqx_license.conf | 6 ------ lib-ee/emqx_license/i18n/emqx_license_schema_i18n.conf | 4 ++++ lib-ee/emqx_license/test/emqx_license_test_lib.erl | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 lib-ee/emqx_license/etc/emqx_license.conf diff --git a/lib-ee/emqx_license/etc/emqx_license.conf b/lib-ee/emqx_license/etc/emqx_license.conf deleted file mode 100644 index 476444ea0..000000000 --- a/lib-ee/emqx_license/etc/emqx_license.conf +++ /dev/null @@ -1,6 +0,0 @@ -license { - # The default license has 1000 connections limit, it is issued on 20220419 and valid for 5 years (1825 days) - key = "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZGVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK.MEQCICbgRVijCQov2hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NCWjhk4PG8tWfw2uFZWruSzD6g==" - connection_low_watermark = 75%, - connection_high_watermark = 80% -} diff --git a/lib-ee/emqx_license/i18n/emqx_license_schema_i18n.conf b/lib-ee/emqx_license/i18n/emqx_license_schema_i18n.conf index 1ee1ed35e..6edb3a263 100644 --- a/lib-ee/emqx_license/i18n/emqx_license_schema_i18n.conf +++ b/lib-ee/emqx_license/i18n/emqx_license_schema_i18n.conf @@ -2,6 +2,10 @@ emqx_license_schema { license_root { desc { en: "Defines the EMQX Enterprise license. \n\n" + "\n" + "The default license has 1000 connections limit, it is " + "issued on 2022-04-19 and valid for 5 years (1825 days).\n" + "\n" "EMQX comes with a default trial license. For production use, please \n" "visit https://www.emqx.com/apply-licenses/emqx to apply." zh: "EMQX企业许可证。\n" diff --git a/lib-ee/emqx_license/test/emqx_license_test_lib.erl b/lib-ee/emqx_license/test/emqx_license_test_lib.erl index 5310921ee..acc230d53 100644 --- a/lib-ee/emqx_license/test/emqx_license_test_lib.erl +++ b/lib-ee/emqx_license/test/emqx_license_test_lib.erl @@ -77,6 +77,6 @@ make_license(Values) -> iolist_to_binary([EncodedText, ".", EncodedSignature]). default_license() -> - %% keep it the same as in etc/emqx_license.conf + %% keep it the same as in emqx_license_schema.erl "MjIwMTExCjAKMTAKRXZhbHVhdGlvbgpjb250YWN0QGVtcXguaW8KZGVmYXVsdAoyMDIyMDQxOQoxODI1CjEwMDAK." "MEQCICbgRVijCQov2hrvZXR1mk9Oa+tyV1F5oJ6iOZeSHjnQAiB9dUiVeaZekDOjztk+NCWjhk4PG8tWfw2uFZWruSzD6g==".