summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge-3.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'test/catlfish-test-local-merge-3.cfg')
-rw-r--r--test/catlfish-test-local-merge-3.cfg3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/catlfish-test-local-merge-3.cfg b/test/catlfish-test-local-merge-3.cfg
index 8c4b4c6..8ae1f49 100644
--- a/test/catlfish-test-local-merge-3.cfg
+++ b/test/catlfish-test-local-merge-3.cfg
@@ -5,11 +5,10 @@ mergeaddress: 127.0.0.1:8183
paths:
configdir: .
knownroots: known_roots
- mergedb: machine/merge-3/db
+ db: machine/merge-3/db
https_certfile: httpscert/httpscert-1.pem
https_keyfile: httpscert/httpskey-1.pem
https_cacertfile: httpsca/demoCA/cacert.pem
- publickeys: publickeys
logpublickey: keys/logkey.pem
privatekeys: privatekeys