소스 검색

refactor(config): delete generated includes

In the following commits, the overrides will be loaded at runtime
Zaiming (Stone) Shi 4 년 전
부모
커밋
bfbc87aaca
1개의 변경된 파일1개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 3
      scripts/merge-config.escript

+ 1 - 3
scripts/merge-config.escript

@@ -21,9 +21,7 @@ main(_) ->
                                    false -> Acc
                                    false -> Acc
                                end
                                end
                        end, BaseConf, Cfgs),
                        end, BaseConf, Cfgs),
-    ClusterInc = "include \"cluster-override.conf\"\n",
-    LocalInc = "include \"local-override.conf\"\n",
-    ok = file:write_file("apps/emqx_conf/etc/emqx.conf.all", [Conf, ClusterInc, LocalInc]).
+    ok = file:write_file("apps/emqx_conf/etc/emqx.conf.all", Conf).
 
 
 get_all_cfgs(Root) ->
 get_all_cfgs(Root) ->
     Apps = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],
     Apps = filelib:wildcard("*", Root) -- ["emqx_machine", "emqx_conf"],