summaryrefslogtreecommitdiff
path: root/src/rabbit.erl
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-06-09 14:15:17 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-06-09 14:15:17 +0100
commit802846a4b4a64a3baebddb2322784c2b7a893591 (patch)
treeb08e7ea63ddf150654052e5d83a0cac083e01300 /src/rabbit.erl
parent438e76e8f8113b77dce286b4cab03c8736c4f44d (diff)
downloadrabbitmq-server-git-802846a4b4a64a3baebddb2322784c2b7a893591.tar.gz
First pass at user tags.
Diffstat (limited to 'src/rabbit.erl')
-rw-r--r--src/rabbit.erl7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl
index 8866a1b738..100cacb0e8 100644
--- a/src/rabbit.erl
+++ b/src/rabbit.erl
@@ -486,16 +486,13 @@ 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, DefaultTags} = application:get_env(default_user_tags),
{ok, DefaultVHost} = application:get_env(default_vhost),
{ok, [DefaultConfigurePerm, DefaultWritePerm, DefaultReadPerm]} =
application:get_env(default_permissions),
ok = rabbit_vhost:add(DefaultVHost),
ok = rabbit_auth_backend_internal:add_user(DefaultUser, DefaultPass),
- case DefaultAdmin of
- true -> rabbit_auth_backend_internal:set_admin(DefaultUser);
- _ -> ok
- end,
+ ok = rabbit_auth_backend_internal:set_tags(DefaultUser, DefaultTags),
ok = rabbit_auth_backend_internal:set_permissions(DefaultUser, DefaultVHost,
DefaultConfigurePerm,
DefaultWritePerm,