diff --git a/.gitignore b/.gitignore index d5338d5c4..8d95669ac 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ rebar-git-cache.tar .git/ apps/emqx_utils/src/emqx_variform_parser.erl apps/emqx_utils/src/emqx_variform_scan.erl +default-profile.mk diff --git a/Makefile b/Makefile index b9ff0dd53..d1726f737 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,7 @@ endif export EMQX_DASHBOARD_VERSION ?= v1.9.0-beta.1 export EMQX_EE_DASHBOARD_VERSION ?= e1.7.0-beta.9 +-include default-profile.mk PROFILE ?= emqx REL_PROFILES := emqx emqx-enterprise PKG_PROFILES := emqx-pkg emqx-enterprise-pkg diff --git a/apps/emqx_license/include/emqx_license.hrl b/apps/emqx_license/include/emqx_license.hrl index 35aa62f5b..820782d5e 100644 --- a/apps/emqx_license/include/emqx_license.hrl +++ b/apps/emqx_license/include/emqx_license.hrl @@ -32,6 +32,7 @@ -define(MEDIUM_CUSTOMER, 1). -define(LARGE_CUSTOMER, 2). -define(BUSINESS_CRITICAL_CUSTOMER, 3). +-define(BYOC_CUSTOMER, 4). -define(EVALUATION_CUSTOMER, 10). -define(EXPIRED_DAY, -90). diff --git a/apps/emqx_license/src/emqx_license_parser.erl b/apps/emqx_license/src/emqx_license_parser.erl index 67ad801bc..af466638a 100644 --- a/apps/emqx_license/src/emqx_license_parser.erl +++ b/apps/emqx_license/src/emqx_license_parser.erl @@ -29,6 +29,7 @@ | ?MEDIUM_CUSTOMER | ?LARGE_CUSTOMER | ?BUSINESS_CRITICAL_CUSTOMER + | ?BYOC_CUSTOMER | ?EVALUATION_CUSTOMER. -type license_type() :: ?OFFICIAL | ?TRIAL.