diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2011-06-28 07:07:52 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2011-06-28 07:07:52 +0100 |
| commit | f1a7fc4cfcf0e566a1cf3f76ca3e73e242d43d6d (patch) | |
| tree | 5a96bb1a0add471e369fe4fc9f13f38ba047faeb /src/rabbit.erl | |
| parent | ecf2ee32580ed5728a4f9845fe0640120e791e17 (diff) | |
| parent | 3e8acf0f3868f3afcd7a6121866fc0cd0f7a8cde (diff) | |
| download | rabbitmq-server-git-f1a7fc4cfcf0e566a1cf3f76ca3e73e242d43d6d.tar.gz | |
merge bug24180 into default
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 7 |
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, |