feat: disable telemetry for ee by default
This commit is contained in:
parent
af579b2f0e
commit
6362476508
|
@ -0,0 +1 @@
|
||||||
|
telemetry.enable = false
|
|
@ -30,7 +30,7 @@ main(_) ->
|
||||||
case IsEnterprise of
|
case IsEnterprise of
|
||||||
true ->
|
true ->
|
||||||
EnterpriseCfgs = get_all_cfgs("lib-ee"),
|
EnterpriseCfgs = get_all_cfgs("lib-ee"),
|
||||||
EnterpriseConf = merge("", EnterpriseCfgs),
|
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);
|
||||||
false ->
|
false ->
|
||||||
ok
|
ok
|
||||||
|
@ -41,22 +41,21 @@ is_enterprise() ->
|
||||||
nomatch =/= string:find(Profile, "enterprise").
|
nomatch =/= string:find(Profile, "enterprise").
|
||||||
|
|
||||||
merge(BaseConf, Cfgs) ->
|
merge(BaseConf, Cfgs) ->
|
||||||
lists:foldl(
|
Confs = [BaseConf | lists:map(fun read_conf/1, Cfgs)],
|
||||||
fun(CfgFile, Acc) ->
|
infix(lists:filter(fun(I) -> iolist_size(I) > 0 end, Confs), [io_lib:nl(), io_lib:nl()]).
|
||||||
case filelib:is_regular(CfgFile) of
|
|
||||||
true ->
|
read_conf(CfgFile) ->
|
||||||
{ok, Bin1} = file:read_file(CfgFile),
|
case filelib:is_regular(CfgFile) of
|
||||||
case string:trim(Bin1, both) of
|
true ->
|
||||||
<<>> -> Acc;
|
{ok, Bin1} = file:read_file(CfgFile),
|
||||||
Bin2 -> [Acc, io_lib:nl(), io_lib:nl(), Bin2]
|
string:trim(Bin1, both);
|
||||||
end;
|
false ->
|
||||||
false ->
|
<<>>
|
||||||
Acc
|
end.
|
||||||
end
|
|
||||||
end,
|
infix([], _With) -> [];
|
||||||
BaseConf,
|
infix([One], _With) -> [One];
|
||||||
Cfgs
|
infix([H | T], With) -> [H, With, infix(T, With)].
|
||||||
).
|
|
||||||
|
|
||||||
get_all_cfgs(Root) ->
|
get_all_cfgs(Root) ->
|
||||||
Apps0 = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],
|
Apps0 = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],
|
||||||
|
|
Loading…
Reference in New Issue