diff options
| author | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-22 17:36:03 +0100 |
|---|---|---|
| committer | Alexandru Scvortov <alexandru@rabbitmq.com> | 2010-09-22 17:36:03 +0100 |
| commit | 8705e92302e760cdd160b995f2028d20b65035e2 (patch) | |
| tree | 72bed3fe9f99560c4fbec0c5ab218d924710bf4c /src/rabbit.erl | |
| parent | c0796e125724dbae63f0faff0f2ee4cd66791e52 (diff) | |
| parent | 42cd6a4e553e44dd09d2d8004cf7ea3eac7da25c (diff) | |
| download | rabbitmq-server-git-8705e92302e760cdd160b995f2028d20b65035e2.tar.gz | |
merge default into bug20284
Diffstat (limited to 'src/rabbit.erl')
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 303d1f3ac0..8c36a9f0a4 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -205,8 +205,7 @@ %%---------------------------------------------------------------------------- prepare() -> - ok = ensure_working_log_handlers(), - ok = rabbit_mnesia:ensure_mnesia_dir(). + ok = ensure_working_log_handlers(). start() -> try @@ -490,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, |