From 5105a511348e58629b394373730f9bf91c3e888e Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Tue, 25 Jul 2017 13:32:26 +0200 Subject: Change paths/mergedb to paths/db in local config Remove unused config variable paths/publickeys --- test/catlfish-test-local-merge-1.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/catlfish-test-local-merge-1.cfg') 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 -- cgit v1.1