diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-03-31 15:23:12 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2015-03-31 15:23:12 +0200 |
| commit | 064556bd0e531c71dd285de372312d2851abf29f (patch) | |
| tree | 94b6e41e85d3a152f284b32b0631512124e53bff /test | |
| parent | 6b62ebbf1de5b9e55b04e9cfafd0620f1374c2d4 (diff) | |
X.509 cert generation for http server
Diffstat (limited to 'test')
| -rw-r--r-- | test/catlfish-test-local-1.cfg | 9 | ||||
| -rw-r--r-- | test/catlfish-test-local-merge.cfg | 2 | ||||
| -rw-r--r-- | test/catlfish-test-local-signing.cfg | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/test/catlfish-test-local-1.cfg b/test/catlfish-test-local-1.cfg index 7caacdc..be1c5b3 100644 --- a/test/catlfish-test-local-1.cfg +++ b/test/catlfish-test-local-1.cfg @@ -9,12 +9,15 @@ addresses: publicaddresses: frontend-1: 127.0.0.1:8080 +#publichttpaddresses: +# frontend-1: 127.0.0.1:8090 + paths: configdir: . knownroots: tests/known_roots - https_certfile: catlfish/webroot/certs/webcert.pem - https_keyfile: catlfish/webroot/keys/webkey.pem - https_cacertfile: catlfish/webroot/certs/webcert.pem + https_certfile: tests/httpscert/httpscert-1.pem + https_keyfile: tests/httpscert/httpskey-1.pem + https_cacertfile: tests/httpsca/demoCA/cacert.pem db: tests/machine/machine-1/db/ publickeys: tests/publickeys logpublickey: tests/keys/logkey.pem diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg index 4a77708..3de20ee 100644 --- a/test/catlfish-test-local-merge.cfg +++ b/test/catlfish-test-local-merge.cfg @@ -2,7 +2,7 @@ nodename: merge-1 paths: mergedb: tests/mergedb - https_cacertfile: catlfish/webroot/certs/webcert.pem + https_cacertfile: tests/httpsca/demoCA/cacert.pem publickeys: tests/publickeys logpublickey: tests/keys/logkey.pem privatekeys: tests/privatekeys diff --git a/test/catlfish-test-local-signing.cfg b/test/catlfish-test-local-signing.cfg index b08bf2f..c8b27ae 100644 --- a/test/catlfish-test-local-signing.cfg +++ b/test/catlfish-test-local-signing.cfg @@ -6,9 +6,9 @@ addresses: paths: configdir: . - https_certfile: catlfish/webroot/certs/webcert.pem - https_keyfile: catlfish/webroot/keys/webkey.pem - https_cacertfile: catlfish/webroot/certs/webcert.pem + https_certfile: tests/httpscert/httpscert-1.pem + https_keyfile: tests/httpscert/httpskey-1.pem + https_cacertfile: tests/httpsca/demoCA/cacert.pem publickeys: tests/publickeys logpublickey: tests/keys/logkey.pem logprivatekey: tests/keys/logkey-private.pem |