Change paths/mergedb to paths/db in local configdocgen2

Remove unused config variable paths/publickeys

8 files changed, 3 insertions, 11 deletions

diff --git a/test/catlfish-test-local-frontend-1.cfg b/test/catlfish-test-local-frontend-1.cfg
index 8ab141c..797d2f6 100644
--- a/test/catlfish-test-local-frontend-1.cfg
+++ b/test/catlfish-test-local-frontend-1.cfg
@@ -16,7 +16,6 @@ paths:
         https_cacertfile: httpsca/demoCA/cacert.pem
         public_cacertfile: httpsca/demoCA/cacert.pem
         db: machine/frontend-1/db/
-        publickeys: publickeys
         logpublickey: keys/logkey.pem
         privatekeys: privatekeys
 
diff --git a/test/catlfish-test-local-frontend-2.cfg b/test/catlfish-test-local-frontend-2.cfg
index 3a2e649..5c2d284 100644
--- a/test/catlfish-test-local-frontend-2.cfg
+++ b/test/catlfish-test-local-frontend-2.cfg
@@ -8,7 +8,6 @@ paths:
         https_cacertfile: httpsca/demoCA/cacert.pem
         public_cacertfile: httpsca/demoCA/cacert.pem
         db: machine/frontend-2/db/
-        publickeys: publickeys
         logpublickey: keys/logkey.pem
         privatekeys: privatekeys
 
diff --git a/test/catlfish-test-local-frontend-3.cfg b/test/catlfish-test-local-frontend-3.cfg
index 27dab58..b3e33c0 100644
--- a/test/catlfish-test-local-frontend-3.cfg
+++ b/test/catlfish-test-local-frontend-3.cfg
@@ -8,7 +8,6 @@ paths:
         https_cacertfile: httpsca/demoCA/cacert.pem
         public_cacertfile: httpsca/demoCA/cacert.pem
         db: machine/frontend-3/db/
-        publickeys: publickeys
         logpublickey: keys/logkey.pem
         privatekeys: privatekeys
 
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
diff --git a/test/catlfish-test-local-merge-2.cfg b/test/catlfish-test-local-merge-2.cfg
index 9a83566..f94841c 100644
--- a/test/catlfish-test-local-merge-2.cfg
+++ b/test/catlfish-test-local-merge-2.cfg
@@ -7,11 +7,10 @@ mergeaddress: 127.0.0.1:8182
 paths:
         configdir: .
         knownroots: known_roots
-        mergedb: machine/merge-2/db
+        db: machine/merge-2/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
         verifycert_bin: ../bin/verifycert.erl.escript
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
 
diff --git a/test/catlfish-test-local-signing-1.cfg b/test/catlfish-test-local-signing-1.cfg
index a2eaff5..4b5aefb 100644
--- a/test/catlfish-test-local-signing-1.cfg
+++ b/test/catlfish-test-local-signing-1.cfg
@@ -7,7 +7,6 @@ paths:
         https_certfile: httpscert/httpscert-1.pem
         https_keyfile: httpscert/httpskey-1.pem
         https_cacertfile: httpsca/demoCA/cacert.pem
-        publickeys: publickeys
         logpublickey: keys/logkey.pem
         logprivatekey: keys/logkey-private.pem
         privatekeys: privatekeys
diff --git a/test/catlfish-test-local-statusserver.cfg b/test/catlfish-test-local-statusserver.cfg
index cef11e6..a8b0f16 100644
--- a/test/catlfish-test-local-statusserver.cfg
+++ b/test/catlfish-test-local-statusserver.cfg
@@ -8,7 +8,6 @@ paths:
         https_keyfile: httpscert/httpskey-1.pem
         https_cacertfile: httpsca/demoCA/cacert.pem
         public_cacertfile: httpsca/demoCA/cacert.pem
-        publickeys: publickeys
         logpublickey: keys/logkey.pem
         privatekeys: privatekeys