Merge pull request #603 from basho/refactor/confbal/ssl

Using riak_core ssl app settings instead of riak_api
basho · May 13, 2014 · cfd473a · cfd473a
2 parents 9e5cf80 + d654a43
commit cfd473a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/tests/pb_cipher_suites.erl b/tests/pb_cipher_suites.erl
@@ -34,12 +34,13 @@ confirm() ->
                         {modules, [mod_get]}]),
 
     lager:info("Deploy some nodes"),
-    Conf = [
-            {riak_api, [
+    Conf = [{riak_core, [
+                {ssl, [
                     {certfile, filename:join([CertDir,"site3.basho.com/cert.pem"])},
                     {keyfile, filename:join([CertDir, "site3.basho.com/key.pem"])},
                     {cacertfile, filename:join([CertDir, "site3.basho.com/cacerts.pem"])}
-                    ]},
+                    ]}
+                ]},
             {riak_search, [
                            {enabled, true}
                           ]}

diff --git a/tests/pb_security.erl b/tests/pb_security.erl
@@ -50,13 +50,13 @@ confirm() ->
     PrivDir = rt:priv_dir(),
     Conf = [
             {riak_core, [
-                    {default_bucket_props, [{allow_mult, true}]}
-                    ]},
-            {riak_api, [
+                {default_bucket_props, [{allow_mult, true}]},
+                {ssl, [
                     {certfile, filename:join([CertDir,"site3.basho.com/cert.pem"])},
                     {keyfile, filename:join([CertDir, "site3.basho.com/key.pem"])},
                     {cacertfile, filename:join([CertDir, "site3.basho.com/cacerts.pem"])}
-                    ]},
+                    ]}
+                ]},
             {riak_search, [
                            {enabled, true}
                           ]}