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 /catlfish.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 'catlfish.config')
| -rw-r--r-- | catlfish.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/catlfish.config b/catlfish.config index 672f997..91868e5 100644 --- a/catlfish.config +++ b/catlfish.config @@ -10,7 +10,7 @@ {catlfish, [{known_roots_path, "known_roots"}, {https_servers, - [{"127.0.0.1", 8080, v1} + [{external_https_api, "127.0.0.1", 8080, v1} ]}, {https_certfile, "catlfish/webroot/certs/webcert.pem"}, {https_keyfile, "catlfish/webroot/keys/webkey.pem"}, |