summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-09-08 23:28:17 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-09-08 23:28:17 +0100
commitd93894fed66dbba7822e55051be21e82814b0b38 (patch)
tree3b9e4adeceaa93a7a985f5e418e6eb3025a78c92 /src/rabbit.erl
parent16ee1c1053e193183f578c7576071735c83912b5 (diff)
parent0d491f8b4ca627277a0b95fa919d7e7b0bc67237 (diff)
downloadrabbitmq-server-git-d93894fed66dbba7822e55051be21e82814b0b38.tar.gz
merge default into bug22902
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index c257497070..8c36a9f0a4 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -489,11 +489,16 @@ maybe_insert_default_data() ->
insert_default_data() ->
{ok, DefaultUser} = application:get_env(default_user),
{ok, DefaultPass} = application:get_env(default_pass),
+ {ok, DefaultAdmin} = application:get_env(default_user_is_admin),
{ok, DefaultVHost} = application:get_env(default_vhost),
{ok, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} =
application:get_env(default_permissions),
ok = rabbit_access_control:add_vhost(DefaultVHost),
ok = rabbit_access_control:add_user(DefaultUser, DefaultPass),
+ case DefaultAdmin of
+ true -> rabbit_access_control:set_admin(DefaultUser);
+ _ -> ok
+ end,
ok = rabbit_access_control:set_permissions(DefaultUser, DefaultVHost,
DefaultConfigurePerm,
DefaultWritePerm,