Better Riak usage detection

diff --git a/src/ejabberd_riak_sup.erl b/src/ejabberd_riak_sup.erl
index a066a3c8cc57cd36cb53c68e820d524a18e4c960..513ad785f563cfdcb388010be2a08f58d2dddc7a 100644 (file)
--- a/src/ejabberd_riak_sup.erl
+++ b/src/ejabberd_riak_sup.erl
@@ -68,6 +68,9 @@ is_riak_configured(Host) ->
     PortConfigured = ejabberd_config:get_option(
                       {riak_port, Host},
                       fun(_) -> true end, false),
+    AuthConfigured = lists:member(
+                      ejabberd_auth_riak,
+                      ejabberd_auth:auth_modules(Host)),
     Modules = ejabberd_config:get_option(
                {modules, Host},
                fun(L) when is_list(L) -> L end, []),
@@ -75,7 +78,8 @@ is_riak_configured(Host) ->
                                   fun({_Module, Opts}) ->
                                           gen_mod:db_type(Opts) == riak
                                   end, Modules),
-    ServerConfigured or PortConfigured or ModuleWithRiakDBConfigured.
+    ServerConfigured or PortConfigured
+       or AuthConfigured or ModuleWithRiakDBConfigured.
 
 do_start() ->
     SupervisorName = ?MODULE,