diff options
| author | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:59:10 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordberg.se> | 2014-10-29 15:59:10 +0100 |
| commit | d79c260758e7544dd46de2adfad85d1c0bee859b (patch) | |
| tree | b580925a77d14eaf1722b410bd0dabd795191a2e /test/config | |
| parent | 5a10cf6fa6fff3cbca3340a7c75120603bda18ca (diff) | |
| parent | 87e02103ea3f47b825b415c415f7d2940d009b42 (diff) | |
Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge
Conflicts:
src/v1.erl
tools/merge.py
tools/testcase1.py
Diffstat (limited to 'test/config')
| -rw-r--r-- | test/config/frontend-1.config | 35 | ||||
| -rw-r--r-- | test/config/storage-1.config | 31 |
2 files changed, 66 insertions, 0 deletions
diff --git a/test/config/frontend-1.config b/test/config/frontend-1.config new file mode 100644 index 0000000..79d887d --- /dev/null +++ b/test/config/frontend-1.config @@ -0,0 +1,35 @@ +%% 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, + [{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/"}, + {storage_nodes, ["https://127.0.0.1:8081/ct/storage/"]}, + {storage_nodes_quorum, 1} + ]}]. diff --git a/test/config/storage-1.config b/test/config/storage-1.config new file mode 100644 index 0000000..b176e1f --- /dev/null +++ b/test/config/storage-1.config @@ -0,0 +1,31 @@ +%% 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/"}]}]. |