Skip to content

Commit c1596d0

Browse files
dumbbellmergify-bot
authored and
mergify-bot
committed
Add support for $RABBITMQ_DEFAULT_{USER,PASS,VHOST} env vars
They are the equivalent of the `default_{user,pass,vhost}` configuration settings. Each set environment variable will take precedence over its configuration file counterpart. Fixes docker-library/rabbitmq#508. (cherry picked from commit 46b8321)
1 parent a465cd0 commit c1596d0

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

deps/rabbit/src/rabbit.erl

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
-module(rabbit).
99

10+
-include_lib("eunit/include/eunit.hrl").
1011
-include_lib("kernel/include/logger.hrl").
1112
-include_lib("rabbit_common/include/logging.hrl").
1213

@@ -1047,10 +1048,10 @@ maybe_insert_default_data() ->
10471048
end.
10481049

10491050
insert_default_data() ->
1050-
{ok, DefaultUser} = application:get_env(default_user),
1051-
{ok, DefaultPass} = application:get_env(default_pass),
1051+
DefaultUser = get_default_data_param(default_user),
1052+
DefaultPass = get_default_data_param(default_pass),
10521053
{ok, DefaultTags} = application:get_env(default_user_tags),
1053-
{ok, DefaultVHost} = application:get_env(default_vhost),
1054+
DefaultVHost = get_default_data_param(default_vhost),
10541055
{ok, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} =
10551056
application:get_env(default_permissions),
10561057

@@ -1077,6 +1078,18 @@ insert_default_data() ->
10771078
?INTERNAL_USER),
10781079
ok.
10791080

1081+
get_default_data_param(Param) ->
1082+
#{var_origins := Origins} = Context = rabbit_prelaunch:get_context(),
1083+
case maps:get(Param, Origins, default) of
1084+
environment ->
1085+
Value = maps:get(Param, Context),
1086+
?assert(is_binary(Value)),
1087+
Value;
1088+
default ->
1089+
{ok, Value} = application:get_env(Param),
1090+
Value
1091+
end.
1092+
10801093
%%---------------------------------------------------------------------------
10811094
%% logging
10821095

0 commit comments

Comments
 (0)