diff options
| author | Magnus Ahltorp <map@kth.se> | 2015-08-24 00:39:44 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2015-08-24 00:39:44 +0200 |
| commit | 00ddbf7b7cb158141fd5e641782ef7c2e59d5997 (patch) | |
| tree | 46a08b72d6db5a1221d50c730e63def2f32d8abe | |
| parent | 7893d7dcc660194b66fad9220ebb54f592ccb420 (diff) | |
Use paths/public_cacertfile config variable for public https cert
| -rw-r--r-- | test/catlfish-test-local-1.cfg | 1 | ||||
| -rwxr-xr-x | tools/storagegc.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/catlfish-test-local-1.cfg b/test/catlfish-test-local-1.cfg index 88eda59..cbe04d8 100644 --- a/test/catlfish-test-local-1.cfg +++ b/test/catlfish-test-local-1.cfg @@ -18,6 +18,7 @@ paths: https_certfile: tests/httpscert/httpscert-1.pem https_keyfile: tests/httpscert/httpskey-1.pem https_cacertfile: tests/httpsca/demoCA/cacert.pem + public_cacertfile: tests/httpsca/demoCA/cacert.pem db: tests/machine/machine-1/db/ publickeys: tests/publickeys logpublickey: tests/keys/logkey.pem diff --git a/tools/storagegc.py b/tools/storagegc.py index e5d6d9d..2ec0720 100755 --- a/tools/storagegc.py +++ b/tools/storagegc.py @@ -22,7 +22,7 @@ localconfig = yaml.load(open(args.localconfig)) paths = localconfig["paths"] db_path = paths["db"] -create_ssl_context(cafile=paths["https_cacertfile"]) +create_ssl_context(cafile=paths.get("public_cacertfile", None)) baseurl = config["baseurl"] |