Merge remote-tracking branch 'refs/remotes/map/compileconfig2'

Conflicts:
	.gitignore

7 files changed, 56 insertions, 135 deletions

diff --git a/test/catlfish-test-local-1.cfg b/test/catlfish-test-local-1.cfg
new file mode 100644
index 0000000..5e9a593
--- /dev/null
+++ b/test/catlfish-test-local-1.cfg
@@ -0,0 +1,17 @@
+localnodes:
+        - frontend-1
+        - storage-1
+
+paths:
+        configdir: test/config/
+        knownroots: known_roots
+        https_certfile: catlfish/webroot/certs/webcert.pem
+        https_keyfile: catlfish/webroot/keys/webkey.pem
+        https_cacertfile: catlfish/webroot/certs/webcert.pem
+        db: tests/machine/machine-1/db/
+        publickeys: publickeys
+        logpublickey: test/eckey-public.pem
+        privatekeys: privatekeys
+
+#options:
+#        - sctcaching
diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg
new file mode 100644
index 0000000..b7f5009
--- /dev/null
+++ b/test/catlfish-test-local-merge.cfg
@@ -0,0 +1,8 @@
+nodename: merge-1
+
+paths:
+        mergedb: ../rel/mergedb
+        https_cacertfile: catlfish/webroot/certs/webcert.pem
+        publickeys: publickeys
+        logpublickey: test/eckey-public.pem
+        privatekeys: privatekeys
diff --git a/test/catlfish-test-local-signing.cfg b/test/catlfish-test-local-signing.cfg
new file mode 100644
index 0000000..047c02b
--- /dev/null
+++ b/test/catlfish-test-local-signing.cfg
@@ -0,0 +1,12 @@
+localnodes:
+        - signing-1
+
+paths:
+        configdir: test/config/
+        https_certfile: catlfish/webroot/certs/webcert.pem
+        https_keyfile: catlfish/webroot/keys/webkey.pem
+        https_cacertfile: catlfish/webroot/certs/webcert.pem
+        publickeys: publickeys
+        logpublickey: test/eckey-public.pem
+        logprivatekey: test/eckey.pem
+        privatekeys: privatekeys
diff --git a/test/catlfish-test.cfg b/test/catlfish-test.cfg
new file mode 100644
index 0000000..7a4bb18
--- /dev/null
+++ b/test/catlfish-test.cfg
@@ -0,0 +1,19 @@
+baseurl: https://127.0.0.1:8080/
+
+frontendnodes:
+        - name: frontend-1
+          publicaddress: 127.0.0.1:8080
+          address: 127.0.0.1:8082
+
+storagenodes:
+        - name: storage-1
+          address: 127.0.0.1:8081
+
+signingnodes:
+        - name: signing-1
+          address: 127.0.0.1:8088
+
+mergenodes:
+        - name: merge-1
+
+storage-quorum-size: 1
diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config
deleted file mode 100644
index 8215027..0000000
--- a/test/config/frontend-1.config
+++ /dev/null
@@ -1,61 +0,0 @@
-%% 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}]},
- {catlfish,
-  [{known_roots_path, "known_roots"},
-   {sctcache_root_path, "tests/machine/machine-1/db/sctcache/"},
-   {https_servers,
-    [{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"},
-   {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/"},
-   {sth_path, "tests/machine/machine-1/db/sth"},
-   {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]},
-   {storage_nodes_quorum, 1},
-   {publickey_path, "publickeys"},
-   {services, [ht]},
-   {log_public_key, "test/eckey-public.pem"},
-   {own_key, {"frontend-1", "privatekeys/frontend-1-private.pem"}},
-   {signing_node, "https://127.0.0.1:8088/ct/signing/"},
-   {allowed_clients, [{"/ct/frontend/sendentry", ["merge-1"]},
-                      {"/ct/frontend/sendlog", ["merge-1"]},
-                      {"/ct/frontend/sendsth", ["merge-1"]},
-                      {"/ct/frontend/currentposition", ["merge-1"]},
-                      {"/ct/frontend/missingentries", ["merge-1"]},
-                      {"/ct/v1/add-chain", noauth},
-                      {"/ct/v1/add-pre-chain", noauth},
-                      {"/ct/v1/get-sth", noauth},
-                      {"/ct/v1/get-sth-consistency", noauth},
-                      {"/ct/v1/get-proof-by-hash", noauth},
-                      {"/ct/v1/get-entries", noauth},
-                      {"/ct/v1/get-entry-and-proof", noauth},
-                      {"/ct/v1/get-roots", noauth}
-                     ]},
-   {allowed_servers, [{"/ct/storage/sendentry", ["storage-1"]},
-                      {"/ct/storage/entrycommitted", ["storage-1"]},
-                      {"/ct/signing/sct", ["signing-1"]},
-                      {"/ct/signing/sth", ["signing-1"]}
-                     ]}
-  ]}].
diff --git a/test/config/signing-1.config b/test/config/signing-1.config
deleted file mode 100644
index a11bdeb..0000000
--- a/test/config/signing-1.config
+++ /dev/null
@@ -1,35 +0,0 @@
-%% 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}]},
- {catlfish,
-  [{known_roots_path, "known_roots"},
-   {https_servers,
-    [{signing_https_api, "127.0.0.1", 8088, signing}
-    ]},
-   {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, "signing-1-error.log"}, {level, error}]},
-     {lager_file_backend, [{file, "signing-1-debug.log"}, {level, debug}]},
-     {lager_file_backend, [{file, "signing-1-console.log"}, {level, info}]}
-    ]}
-  ]},
- {plop,
-  [{publickey_path, "publickeys"},
-   {services, [sign]},
-   {log_private_key, "test/eckey.pem"},
-   {log_public_key, "test/eckey-public.pem"},
-   {own_key, {"signing-1", "privatekeys/signing-1-private.pem"}},
-   {allowed_clients, [{"/ct/signing/sct", ["frontend-1"]},
-                      {"/ct/signing/sth", ["merge-1"]}
-                     ]}
-  ]}].
diff --git a/test/config/storage-1.config b/test/config/storage-1.config
deleted file mode 100644
index 005a8ad..0000000
--- a/test/config/storage-1.config
+++ /dev/null
@@ -1,39 +0,0 @@
-%% 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}]},
- {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},
-     {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/"},
-   {publickey_path, "publickeys"},
-   {own_key, {"storage-1", "privatekeys/storage-1-private.pem"}},
-   {allowed_clients, [{"/ct/storage/sendentry", ["frontend-1"]},
-                      {"/ct/storage/entrycommitted", ["frontend-1"]},
-                      {"/ct/storage/fetchnewentries", ["merge-1"]},
-                      {"/ct/storage/getentry", noauth}
-                     ]}
-]}].