summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge-1.cfg
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2017-07-25 13:32:26 +0200
committerMagnus Ahltorp <map@kth.se>2017-07-25 13:32:26 +0200
commit5105a511348e58629b394373730f9bf91c3e888e (patch)
tree2ebc9618315ef7e1c520ebbe3baf7b9a51830e8f /test/catlfish-test-local-merge-1.cfg
parent24569ff28412cb1b439070e83caa3bbb5fbd01c5 (diff)
Change paths/mergedb to paths/db in local configdocgen2
Remove unused config variable paths/publickeys
Diffstat (limited to 'test/catlfish-test-local-merge-1.cfg')
-rw-r--r--test/catlfish-test-local-merge-1.cfg3
1 files changed, 1 insertions, 2 deletions
diff --git a/test/catlfish-test-local-merge-1.cfg b/test/catlfish-test-local-merge-1.cfg
index 2de391e..e4afd06 100644
--- a/test/catlfish-test-local-merge-1.cfg
+++ b/test/catlfish-test-local-merge-1.cfg
@@ -2,12 +2,11 @@ nodename: merge-1
paths:
configdir: .
- mergedb: machine/merge-1/db
+ db: machine/merge-1/db
# TODO: https_certfile and https_keyfile not strictly necessary for primary merge
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
verifycert_bin: ../bin/verifycert.erl.escript