Move internal HTTP APIs to mochiweb.

4 files changed, 10 insertions, 49 deletions

diff --git a/test/config/frontend-1-httpd.conf b/test/config/frontend-1-httpd.conf
deleted file mode 100644
index 70f91ee..0000000
--- a/test/config/frontend-1-httpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
-%%% See LICENSE for licensing information.
-[
- {port, 8082},
- {bind_address, {127, 0, 0, 1}},
- {server_name, "flimsy"},
- {server_root, "catlfish/webroot"},
- {document_root, "catlfish/webroot/docroot"},
- {modules, [mod_alias, mod_auth, mod_esi, mod_get, mod_head,
-            mod_log, mod_disk_log]},
- {erl_script_alias, {"/ct", [frontend]}},
- {erl_script_nocache, true},
- {error_log, "log/error"},
- {security_log, "log/security"},
- {transfer_log, "log/transfer"},
- {socket_type,
-  {essl,                              % See ssl(3erl) for SSL options.
-   [{certfile, "catlfish/webroot/certs/webcert.pem"},
-    {keyfile, "catlfish/webroot/keys/webkey.pem"},
-    {cacertfile, "catlfish/webroot/certs/webcert.pem"}]}}
-].
diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config
index 4505581..79d887d 100644
--- a/test/config/frontend-1.config
+++ b/test/config/frontend-1.config
@@ -6,13 +6,11 @@
    {error_logger_mf_dir, "log"},
    {error_logger_mf_maxbytes, 10485760},	% 10 MB
    {error_logger_mf_maxfiles, 10}]},
- {inets,
-  [{services,
-    [{httpd, [{proplist_file, "frontend-1-httpd.conf"}]}]}]},
  {catlfish,
   [{known_roots_path, "known_roots"},
    {https_servers,
-    [{"127.0.0.1", 8080, v1}
+    [{external_https_api, "127.0.0.1", 8080, v1},
+     {frontend_https_api, "127.0.0.1", 8082, frontend}
     ]},
    {https_certfile, "catlfish/webroot/certs/webcert.pem"},
    {https_keyfile, "catlfish/webroot/keys/webkey.pem"},
diff --git a/test/config/storage-1-httpd.conf b/test/config/storage-1-httpd.conf
deleted file mode 100644
index 2f271f8..0000000
--- a/test/config/storage-1-httpd.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-%%% Copyright (c) 2014, NORDUnet A/S.
-%%% See LICENSE for licensing information.
-[
- {port, 8081},
- {bind_address, {127, 0, 0, 1}},
- {server_name, "flimsy"},
- {server_root, "catlfish/webroot"},
- {document_root, "catlfish/webroot/docroot"},
- {modules, [mod_alias, mod_auth, mod_esi, mod_get, mod_head,
-            mod_log, mod_disk_log]},
- {erl_script_alias, {"/ct", [storage]}},
- {erl_script_nocache, true},
- {error_log, "log/error_storage"},
- {security_log, "log/security_storage"},
- {transfer_log, "log/transfer_storage"},
- {socket_type,
-  {essl,                              % See ssl(3erl) for SSL options.
-   [{certfile, "catlfish/webroot/certs/webcert.pem"},
-    {keyfile, "catlfish/webroot/keys/webkey.pem"},
-    {cacertfile, "catlfish/webroot/certs/webcert.pem"}]}}
-].
diff --git a/test/config/storage-1.config b/test/config/storage-1.config
index 5b67bbf..b176e1f 100644
--- a/test/config/storage-1.config
+++ b/test/config/storage-1.config
@@ -6,9 +6,14 @@
    {error_logger_mf_dir, "log"},
    {error_logger_mf_maxbytes, 10485760},	% 10 MB
    {error_logger_mf_maxfiles, 10}]},
- {inets,
-  [{services,
-    [{httpd, [{proplist_file, "storage-1-httpd.conf"}]}]}]},
+ {catlfish,
+  [{https_servers,
+    [{storage_https_api, "127.0.0.1", 8081, storage}
+    ]},
+   {https_certfile, "catlfish/webroot/certs/webcert.pem"},
+   {https_keyfile, "catlfish/webroot/keys/webkey.pem"},
+   {https_cacertfile, "catlfish/webroot/certs/webcert.pem"}
+  ]},
  {lager,
   [{handlers,
     [{lager_console_backend, info},