From 9aa83cb0a236c7a096c057529e22afcd036c820b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 22 Jun 2023 17:28:48 +0200 Subject: [PATCH] refactor(config-examples): do not include ee examples in ce --- rebar.config.erl | 14 +++++++++++--- .../file_transfer-with-local-exporter.conf.example | 0 .../file_transfer-with-s3-exporter.conf.example | 0 3 files changed, 11 insertions(+), 3 deletions(-) rename rel/config/{examples => ee-examples}/file_transfer-with-local-exporter.conf.example (100%) rename rel/config/{examples => ee-examples}/file_transfer-with-s3-exporter.conf.example (100%) diff --git a/rebar.config.erl b/rebar.config.erl index f8f96e82c..0122751fb 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -520,12 +520,12 @@ relx_overlay(ReleaseType, Edition) -> {copy, "bin/nodetool", "bin/nodetool-{{release_version}}"} ] ++ etc_overlay(ReleaseType, Edition). -etc_overlay(ReleaseType, _Edition) -> +etc_overlay(ReleaseType, Edition) -> Templates = emqx_etc_overlay(ReleaseType), [ {mkdir, "etc/"}, - {copy, "{{base_dir}}/lib/emqx/etc/certs", "etc/"}, - {copy, "rel/config/examples", "etc/"} + {copy, "{{base_dir}}/lib/emqx/etc/certs", "etc/"} + | copy_examples(Edition) ] ++ lists:map( fun @@ -535,6 +535,14 @@ etc_overlay(ReleaseType, _Edition) -> Templates ). +copy_examples(ce) -> + [{copy, "rel/config/examples", "etc/"}]; +copy_examples(ee) -> + [ + {copy, "rel/config/examples", "etc/"}, + {copy, "rel/config/ee-examples/*", "etc/examples/"} + ]. + emqx_etc_overlay(ReleaseType) -> emqx_etc_overlay_per_rel(ReleaseType) ++ emqx_etc_overlay(). diff --git a/rel/config/examples/file_transfer-with-local-exporter.conf.example b/rel/config/ee-examples/file_transfer-with-local-exporter.conf.example similarity index 100% rename from rel/config/examples/file_transfer-with-local-exporter.conf.example rename to rel/config/ee-examples/file_transfer-with-local-exporter.conf.example diff --git a/rel/config/examples/file_transfer-with-s3-exporter.conf.example b/rel/config/ee-examples/file_transfer-with-s3-exporter.conf.example similarity index 100% rename from rel/config/examples/file_transfer-with-s3-exporter.conf.example rename to rel/config/ee-examples/file_transfer-with-s3-exporter.conf.example