From 574f96fba9fd01ec9725c5509f02ad13d8ab8793 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Fri, 24 Oct 2014 17:22:30 +0200 Subject: System tests for external merge --- test/config/frontend-1.config | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 test/config/frontend-1.config (limited to 'test/config/frontend-1.config') 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} + ]}]. -- cgit v1.1 From f0c78cf6c6caedffd1069b4c41e41ec8ca7fb1c7 Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Sat, 25 Oct 2014 02:08:25 +0200 Subject: Move internal HTTP APIs to mochiweb. --- test/config/frontend-1.config | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'test/config/frontend-1.config') 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"}, -- cgit v1.1