diff --git a/apps/emqx_conf/src/emqx_conf.erl b/apps/emqx_conf/src/emqx_conf.erl index 00648db31..3da9f0457 100644 --- a/apps/emqx_conf/src/emqx_conf.erl +++ b/apps/emqx_conf/src/emqx_conf.erl @@ -146,8 +146,7 @@ dump_schema(Dir, SchemaModule, I18nFile) -> fun(Lang) -> gen_config_md(Dir, I18nFile, SchemaModule, Lang), gen_api_schema_json(Dir, I18nFile, Lang), - ExampleDir = filename:join(filename:dirname(filename:dirname(I18nFile)), "etc"), - gen_example_conf(ExampleDir, I18nFile, SchemaModule, Lang) + gen_example_conf(Dir, I18nFile, SchemaModule, Lang) end, [en, zh] ), diff --git a/build b/build index de00aba6c..d473f84df 100755 --- a/build +++ b/build @@ -112,9 +112,10 @@ make_docs() { SCHEMA_MODULE='emqx_conf_schema' ;; esac + mkdir -p _build/docgen # shellcheck disable=SC2086 erl -noshell -pa $libs_dir1 $libs_dir2 $libs_dir3 -eval \ - "Dir = filename:join([apps, emqx_dashboard, priv, www, static]), \ + "Dir = filename:join(['_build', docgen]), \ I18nFile = filename:join([apps, emqx_dashboard, priv, 'i18n.conf']), \ ok = emqx_conf:dump_schema(Dir, $SCHEMA_MODULE, I18nFile), \ halt(0)." diff --git a/rebar.config.erl b/rebar.config.erl index 9d9b0f874..c64f3dda2 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -462,7 +462,7 @@ etc_overlay(ReleaseType, Edition) -> [ {mkdir, "etc/"}, {copy, "{{base_dir}}/lib/emqx/etc/certs", "etc/"}, - {copy, "apps/emqx_dashboard/etc/emqx.conf.en.example", "etc/emqx-example.conf"} + {copy, "_build/docgen/emqx.conf.en.example", "etc/emqx.conf.example"} ] ++ lists:map( fun