Change paths/mergedb to paths/db in local configdocgen2

Remove unused config variable paths/publickeys

1 files changed, 7 insertions, 7 deletions

diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index e6c5ec6..264cb42 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -353,9 +353,9 @@ def gen_config(nodename, config, localconfig):
         ]
     if "mergenodes" in nodetype:
         plopconfig += [
-            (Symbol("verifiedsize_path"), paths["mergedb"] + "/verifiedsize"),
-            (Symbol("index_path"), paths["mergedb"] + "/logorder"),
-            (Symbol("entry_root_path"), paths["mergedb"] + "/chains"),
+            (Symbol("verifiedsize_path"), paths["db"] + "/verifiedsize"),
+            (Symbol("index_path"), paths["db"] + "/logorder"),
+            (Symbol("entry_root_path"), paths["db"] + "/chains"),
             ]
 
     signingnodenames = [node["name"] for node in config["signingnodes"]]
@@ -409,10 +409,10 @@ def gen_config(nodename, config, localconfig):
             reloadableplopconfig.append((Symbol("merge_backup_sendentries_chunksize"), merge["backup-sendentries-chunksize"]))
             reloadableplopconfig.append((Symbol("frontend_nodes"), zip(frontendnodenames, frontendnodeaddresses)))
             reloadableplopconfig.append((Symbol("merge_secondaries"), zip(mergesecondarynames, mergesecondaryaddresses)))
-            plopconfig.append((Symbol("sth_path"), paths["mergedb"] + "/sth"))
-            plopconfig.append((Symbol("fetched_path"), paths["mergedb"] + "/fetched"))
-            plopconfig.append((Symbol("verified_path"), paths["mergedb"] + "/verified"))
-            plopconfig.append((Symbol("minsize_path"), paths["mergedb"] + "/minsize"))
+            plopconfig.append((Symbol("sth_path"), paths["db"] + "/sth"))
+            plopconfig.append((Symbol("fetched_path"), paths["db"] + "/fetched"))
+            plopconfig.append((Symbol("verified_path"), paths["db"] + "/verified"))
+            plopconfig.append((Symbol("minsize_path"), paths["db"] + "/minsize"))
             reloadableplopconfig.append((Symbol("signing_nodes"), signingnodeaddresses))
             reloadableplopconfig.append((Symbol("backup_quorum"), config["backup-quorum-size"]))
             allowed_servers += allowed_servers_primarymerge(frontendnodenames, mergesecondarynames, signingnodenames)