Merge pull request #8740 from lafirest/fix/bootstrap_user_file_5.0.5

fix(dashboard): change `bootstrap_user` to `bootstrap_user_file`
This commit is contained in:
lafirest 2022-08-18 09:48:32 +08:00 committed by GitHub
commit bf452113a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions

View File

@ -197,7 +197,7 @@ its own from which a browser should permit loading resources."""
zh: "多语言支持"
}
}
bootstrap_user {
bootstrap_user_file {
desc {
en: "Initialize users file."
zh: "初始化用户文件"

View File

@ -87,7 +87,7 @@ add_default_user() ->
-spec add_bootstrap_user() -> ok | {error, _}.
add_bootstrap_user() ->
case emqx:get_config([dashboard, bootstrap_user], undefined) of
case emqx:get_config([dashboard, bootstrap_user_file], undefined) of
undefined ->
ok;
File ->
@ -324,7 +324,12 @@ add_bootstrap_user(File) ->
after
file:close(Dev)
end;
Error ->
{error, Reason} = Error ->
?SLOG(error, #{
msg => "failed to open the dashboard bootstrap users file",
file => File,
reason => Reason
}),
Error
end.

View File

@ -55,7 +55,8 @@ fields("dashboard") ->
)},
{cors, fun cors/1},
{i18n_lang, fun i18n_lang/1},
{bootstrap_user, ?HOCON(binary(), #{desc => ?DESC(bootstrap_user), required => false})}
{bootstrap_user_file,
?HOCON(binary(), #{desc => ?DESC(bootstrap_user_file), required => false})}
];
fields("listeners") ->
[