From 803adf14ec4116d2997feca38c4c259d5d47f71a Mon Sep 17 00:00:00 2001 From: Magnus Ahltorp Date: Thu, 18 Jun 2015 09:20:14 +0100 Subject: Preliminary merge secondary support. Change merge db to lowercase. --- test/catlfish-test-local-merge-2.cfg | 18 ++++++++++++++++++ test/catlfish-test.cfg | 5 +++++ 2 files changed, 23 insertions(+) create mode 100644 test/catlfish-test-local-merge-2.cfg (limited to 'test') diff --git a/test/catlfish-test-local-merge-2.cfg b/test/catlfish-test-local-merge-2.cfg new file mode 100644 index 0000000..28c4eda --- /dev/null +++ b/test/catlfish-test-local-merge-2.cfg @@ -0,0 +1,18 @@ +localnodes: + - merge-2 + +addresses: + merge-2: 127.0.0.1:8181 + +nodename: merge-2 + +paths: + configdir: . + knownroots: tests/known_roots + mergedb: tests/mergedb-secondary + https_certfile: tests/httpscert/httpscert-1.pem + https_keyfile: tests/httpscert/httpskey-1.pem + https_cacertfile: tests/httpsca/demoCA/cacert.pem + publickeys: tests/publickeys + logpublickey: tests/keys/logkey.pem + privatekeys: tests/privatekeys diff --git a/test/catlfish-test.cfg b/test/catlfish-test.cfg index 6cb3bed..77539b6 100644 --- a/test/catlfish-test.cfg +++ b/test/catlfish-test.cfg @@ -15,6 +15,11 @@ signingnodes: mergenodes: - name: merge-1 + address: localhost:8180 + - name: merge-2 + address: localhost:8181 + +primarymergenode: merge-1 storage-quorum-size: 1 -- cgit v1.1