System tests for external merge

4 files changed, 105 insertions, 0 deletions

diff --git a/test/config/frontend-1-httpd.conf b/test/config/frontend-1-httpd.conf
new file mode 100644
index 0000000..70f91ee
--- /dev/null
+++ b/test/config/frontend-1-httpd.conf
@@ -0,0 +1,21 @@
+%%% 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
new file mode 100644
index 0000000..4505581
--- /dev/null
+++ b/test/config/frontend-1.config
@@ -0,0 +1,37 @@
+%% catlfish configuration file (-*- erlang -*-)
+
+[{sasl,
+  [{sasl_error_logger, false},
+   {errlog_type, error},
+   {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}
+    ]},
+   {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},
+     {lager_file_backend, [{file, "frontend-1-error.log"}, {level, error}]},
+     {lager_file_backend, [{file, "frontend-1-debug.log"}, {level, debug}]},
+     {lager_file_backend, [{file, "frontend-1-console.log"}, {level, info}]}
+    ]}
+  ]},
+ {plop,
+  [{entry_root_path, "tests/machine/machine-1/db/certentries/"},
+   {index_path, "tests/machine/machine-1/db/index"},
+   {entryhash_root_path, "tests/machine/machine-1/db/entryhash/"},
+   {treesize_path, "tests/machine/machine-1/db/treesize"},
+   {indexforhash_root_path, "tests/machine/machine-1/db/certindex/"},
+   {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]},
+   {storage_nodes_quorum, 1}
+  ]}].
diff --git a/test/config/storage-1-httpd.conf b/test/config/storage-1-httpd.conf
new file mode 100644
index 0000000..2f271f8
--- /dev/null
+++ b/test/config/storage-1-httpd.conf
@@ -0,0 +1,21 @@
+%%% 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
new file mode 100644
index 0000000..5b67bbf
--- /dev/null
+++ b/test/config/storage-1.config
@@ -0,0 +1,26 @@
+%% catlfish configuration file (-*- erlang -*-)
+
+[{sasl,
+  [{sasl_error_logger, false},
+   {errlog_type, error},
+   {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"}]}]}]},
+ {lager,
+  [{handlers,
+    [{lager_console_backend, info},
+     {lager_file_backend, [{file, "storage-1-error.log"}, {level, error}]},
+     {lager_file_backend, [{file, "storage-1-debug.log"}, {level, debug}]},
+     {lager_file_backend, [{file, "storage-1-console.log"}, {level, info}]}
+    ]}
+  ]},
+ {plop,
+  [{entry_root_path, "tests/machine/machine-1/db/certentries/"},
+   {index_path, "tests/machine/machine-1/db/index"},
+   {newentries_path, "tests/machine/machine-1/db/newentries"},
+   {entryhash_root_path, "tests/machine/machine-1/db/entryhash/"},
+   {treesize_path, "tests/machine/machine-1/db/treesize"},
+   {indexforhash_root_path, "tests/machine/machine-1/db/certindex/"}]}].