From 6a470dc3ac8b9089140cc3597ba4bbfd635ef25f Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Tue, 13 Sep 2022 18:53:09 +0800
Subject: [PATCH 1/2] feat: don't include emqx-entriprise.conf in opensource

---
 mix.exs                      |  4 ++--
 rebar.config.erl             |  2 +-
 scripts/merge-config.escript | 13 ++++++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/mix.exs b/mix.exs
index 3f55de64b..ff33c09eb 100644
--- a/mix.exs
+++ b/mix.exs
@@ -373,9 +373,9 @@ defmodule EMQXUmbrella.MixProject do
 
     if edition_type == :enterprise do
       render_template(
-        "apps/emqx_conf/etc/emqx_enterprise.conf.all",
+        "apps/emqx_conf/etc/emqx-enterprise.conf.all",
         assigns,
-        Path.join(etc, "emqx_enterprise.conf")
+        Path.join(etc, "emqx-enterprise.conf")
       )
     end
 
diff --git a/rebar.config.erl b/rebar.config.erl
index ce1930ed6..02f075f18 100644
--- a/rebar.config.erl
+++ b/rebar.config.erl
@@ -477,7 +477,7 @@ emqx_etc_overlay_per_edition(ce) ->
     ];
 emqx_etc_overlay_per_edition(ee) ->
     [
-        {"{{base_dir}}/lib/emqx_conf/etc/emqx_enterprise.conf.all", "etc/emqx_enterprise.conf"},
+        {"{{base_dir}}/lib/emqx_conf/etc/emqx-enterprise.conf.all", "etc/emqx-enterprise.conf"},
         {"{{base_dir}}/lib/emqx_conf/etc/emqx.conf.all", "etc/emqx.conf"}
     ].
 
diff --git a/scripts/merge-config.escript b/scripts/merge-config.escript
index 67551bfbe..f617dbb70 100755
--- a/scripts/merge-config.escript
+++ b/scripts/merge-config.escript
@@ -12,22 +12,25 @@
 -define(APPS, ["emqx", "emqx_dashboard", "emqx_authz"]).
 
 main(_) ->
+    Profile = os:getenv("PROFILE", "emqx"),
     {ok, BaseConf} = file:read_file("apps/emqx_conf/etc/emqx_conf.conf"),
-
     Cfgs = get_all_cfgs("apps/"),
+    Enterprise =
+        case Profile of
+            "emqx" -> [];
+            "emqx-enterprise" -> [io_lib:nl(), "include emqx-enterprise.conf", io_lib:nl()]
+        end,
     Conf = [
         merge(BaseConf, Cfgs),
         io_lib:nl(),
-        io_lib:nl(),
-        "include emqx_enterprise.conf",
-        io_lib:nl()
+        Enterprise
     ],
     ok = file:write_file("apps/emqx_conf/etc/emqx.conf.all", Conf),
 
     EnterpriseCfgs = get_all_cfgs("lib-ee/"),
     EnterpriseConf = merge("", EnterpriseCfgs),
 
-    ok = file:write_file("apps/emqx_conf/etc/emqx_enterprise.conf.all", EnterpriseConf).
+    ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf).
 
 merge(BaseConf, Cfgs) ->
     lists:foldl(

From 499ed3ca51af97a7780ff529888a3142c26f6026 Mon Sep 17 00:00:00 2001
From: Zhongwen Deng <zhongwencool@gmail.com>
Date: Wed, 14 Sep 2022 09:57:34 +0800
Subject: [PATCH 2/2] chore: don't generate enterprise.conf when not
 emqx-enterprise profile

---
 scripts/merge-config.escript | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/merge-config.escript b/scripts/merge-config.escript
index f617dbb70..f78083ee1 100755
--- a/scripts/merge-config.escript
+++ b/scripts/merge-config.escript
@@ -12,13 +12,13 @@
 -define(APPS, ["emqx", "emqx_dashboard", "emqx_authz"]).
 
 main(_) ->
-    Profile = os:getenv("PROFILE", "emqx"),
     {ok, BaseConf} = file:read_file("apps/emqx_conf/etc/emqx_conf.conf"),
     Cfgs = get_all_cfgs("apps/"),
+    IsEnterprise = is_enterprise(),
     Enterprise =
-        case Profile of
-            "emqx" -> [];
-            "emqx-enterprise" -> [io_lib:nl(), "include emqx-enterprise.conf", io_lib:nl()]
+        case IsEnterprise of
+            false -> [];
+            true -> [io_lib:nl(), "include emqx-enterprise.conf", io_lib:nl()]
         end,
     Conf = [
         merge(BaseConf, Cfgs),
@@ -27,10 +27,18 @@ main(_) ->
     ],
     ok = file:write_file("apps/emqx_conf/etc/emqx.conf.all", Conf),
 
-    EnterpriseCfgs = get_all_cfgs("lib-ee/"),
-    EnterpriseConf = merge("", EnterpriseCfgs),
+    case IsEnterprise of
+        true ->
+            EnterpriseCfgs = get_all_cfgs("lib-ee/"),
+            EnterpriseConf = merge("", EnterpriseCfgs),
+            ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf);
+        false ->
+            ok
+    end.
 
-    ok = file:write_file("apps/emqx_conf/etc/emqx-enterprise.conf.all", EnterpriseConf).
+is_enterprise() ->
+    Profile = os:getenv("PROFILE", "emqx"),
+    nomatch =/= string:find(Profile, "enterprise").
 
 merge(BaseConf, Cfgs) ->
     lists:foldl(