summaryrefslogtreecommitdiff
path: root/test/catlfish-test-local-merge.cfg
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-01-24 09:16:28 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-01 11:24:28 +0100
commitb7b8903b6a7c3342933b9984afa72fb6527b5f72 (patch)
treefc92bfb8b1dccd1dca3f24cba98cf3ea540687bc /test/catlfish-test-local-merge.cfg
parentc0d8aceccb0961a25ee58a163441bbcbe6d6ea3d (diff)
Parallelised merge, distribution phase.
Diffstat (limited to 'test/catlfish-test-local-merge.cfg')
-rw-r--r--test/catlfish-test-local-merge.cfg15
1 files changed, 14 insertions, 1 deletions
diff --git a/test/catlfish-test-local-merge.cfg b/test/catlfish-test-local-merge.cfg
index 3b4d45f..bf1d3c1 100644
--- a/test/catlfish-test-local-merge.cfg
+++ b/test/catlfish-test-local-merge.cfg
@@ -1,14 +1,27 @@
nodename: merge-1
+localnodes:
+ - merge-1
+
paths:
+ configdir: .
mergedb: mergedb
+ # 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
- known_roots: known_roots/
+ knownroots: known_roots/
logadminkey: MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQ
Ah9sZ2CD+JeLbprS6AFcZbo0TGCH0rtEnr2Q3JW0ylhfA+
0/WLu755b3soVX/wI23vqCVGC7N9fOB2WUltveQ==
+
+merge:
+ min-delay: 1
+ dist-window-size: 2
+ dist-sendlog-chunksize: 1
+ dist-sendentries-chunksize: 1