diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit.erl | 8 | ||||
| -rw-r--r-- | src/rabbit_access_control.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 4 |
3 files changed, 5 insertions, 13 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index f11e87bcb5..a45b927bcf 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -213,12 +213,8 @@ insert_default_data() -> {ok, DefaultPass} = application:get_env(default_pass), {ok, DefaultVHost} = application:get_env(default_vhost), ok = rabbit_access_control:add_vhost(DefaultVHost), - ok = insert_default_user(DefaultUser, DefaultPass, DefaultVHost), - ok. - -insert_default_user(Username, Password, VHostPath) -> - ok = rabbit_access_control:add_user(Username, Password), - ok = rabbit_access_control:map_user_vhost(Username, VHostPath), + ok = rabbit_access_control:add_user(DefaultUser, DefaultPass), + ok = rabbit_access_control:map_user_vhost(DefaultUser, DefaultVHost), ok. start_builtin_amq_applications() -> diff --git a/src/rabbit_access_control.erl b/src/rabbit_access_control.erl index c926eacba7..9bc965148b 100644 --- a/src/rabbit_access_control.erl +++ b/src/rabbit_access_control.erl @@ -173,10 +173,8 @@ add_vhost(VHostPath) -> case mnesia:read({vhost, VHostPath}) of [] -> ok = mnesia:write(#vhost{virtual_host = VHostPath}), - #exchange{} = rabbit_exchange:declare(rabbit_misc:r(VHostPath, exchange, <<"">>), direct, true, false, []), - #exchange{} = rabbit_exchange:declare(rabbit_misc:r(VHostPath, exchange, <<"amq.direct">>), direct, true, false, []), - #exchange{} = rabbit_exchange:declare(rabbit_misc:r(VHostPath, exchange, <<"amq.topic">>), topic, true, false, []), - #exchange{} = rabbit_exchange:declare(rabbit_misc:r(VHostPath, exchange, <<"amq.fanout">>), fanout, true, false, []), + [ rabbit_exchange:declare(rabbit_misc:r(VHostPath, exchange, Name), Type, true, false, []) || {Name,Type} + <- [{<<"">>, direct}, { <<"amq.direct">>, direct}, {<<"amq.topic">>, topic}, {<<"amq.fanout">>, fanout}]], ok; [_] -> mnesia:abort({vhost_already_exists, VHostPath}) diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 6d501fe2fd..2c57b16c82 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -66,9 +66,7 @@ -spec(get_config/2 :: (atom(), A) -> A). -spec(set_config/2 :: (atom(), any()) -> 'ok'). -spec(dirty_read/1 :: ({atom(), any()}) -> {'ok', any()} | not_found()). --spec(r/3 :: (#resource{virtual_host :: vhost(), - kind :: K, - name :: '_' | vhost(), K, name()) -> +-spec(r/3 :: (#resource{virtual_host :: vhost()} | vhost(), K, name()) -> r(K) when is_subtype(K, atom())). -spec(r/2 :: (vhost(), K) -> #resource{virtual_host :: vhost(), kind :: K, |