diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/compileconfig.py | 14 | ||||
| -rw-r--r-- | tools/configschema.py | 2 | ||||
| -rwxr-xr-x | tools/initlog.py | 2 | ||||
| -rwxr-xr-x | tools/merge_backup.py | 2 | ||||
| -rwxr-xr-x | tools/merge_dist.py | 2 | ||||
| -rwxr-xr-x | tools/merge_fetch.py | 4 | ||||
| -rwxr-xr-x | tools/mergestatus.py | 2 | ||||
| -rwxr-xr-x | tools/testcase1.py | 2 |
8 files changed, 14 insertions, 16 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) diff --git a/tools/configschema.py b/tools/configschema.py index 9bb4b15..9f4a468 100644 --- a/tools/configschema.py +++ b/tools/configschema.py @@ -21,9 +21,7 @@ localconfigschema = [ ("paths/logpublickey", "string", "path"), ("paths/privatekeys", "string", "path"), ("paths/public_cacertfile", "string", "path"), - ("paths/publickeys", "string", "path"), ("paths/verifycert_bin", "string", "path"), - ("paths/mergedb", "string", "path"), ("paths/logprivatekey", "string", "path"), ("ratelimits/add_chain", "string", "rate"), ("merge/min-delay", "integer", "seconds"), diff --git a/tools/initlog.py b/tools/initlog.py index 9b30979..222129c 100755 --- a/tools/initlog.py +++ b/tools/initlog.py @@ -57,7 +57,7 @@ def main(): own_key = (localconfig["nodename"], "%s/%s-private.pem" % (paths["privatekeys"], localconfig["nodename"])) - mergedb = paths["mergedb"] + mergedb = paths["db"] sthfile = mergedb + "/sth" logorderfile = mergedb + "/logorder" currentsizefile = mergedb + "/fetched" diff --git a/tools/merge_backup.py b/tools/merge_backup.py index 381ace1..e3385d4 100755 --- a/tools/merge_backup.py +++ b/tools/merge_backup.py @@ -110,7 +110,7 @@ def merge_backup(args, config, localconfig, secondaries): own_key = (localconfig["nodename"], "%s/%s-private.pem" % (paths["privatekeys"], localconfig["nodename"])) - mergedb = paths["mergedb"] + mergedb = paths["db"] chainsdb = perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") logorderfile = mergedb + "/logorder" currentsizefile = mergedb + "/fetched" diff --git a/tools/merge_dist.py b/tools/merge_dist.py index 895d560..c1fdb42 100755 --- a/tools/merge_dist.py +++ b/tools/merge_dist.py @@ -85,7 +85,7 @@ def merge_dist(args, localconfig, frontendnodes, timestamp): own_key = (localconfig["nodename"], "%s/%s-private.pem" % (paths["privatekeys"], localconfig["nodename"])) - mergedb = paths["mergedb"] + mergedb = paths["db"] chainsdb = perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") logorderfile = mergedb + "/logorder" sthfile = mergedb + "/sth" diff --git a/tools/merge_fetch.py b/tools/merge_fetch.py index fb5cbb8..bf5a204 100755 --- a/tools/merge_fetch.py +++ b/tools/merge_fetch.py @@ -81,7 +81,7 @@ def do_reportbench(node, baseurl, own_key, target, tag, seq, starttime, elapsed) def merge_fetch(args, config, localconfig, currentsizefile): paths = localconfig["paths"] storagenodes = config["storagenodes"] - mergedb = paths["mergedb"] + mergedb = paths["db"] logorderfile = mergedb + "/logorder" chainsdb = perm(localconfig.get("dbbackend", "filedb"), mergedb + "/chains") own_key = (localconfig["nodename"], @@ -201,7 +201,7 @@ def main(): """ args, config, localconfig = parse_args() paths = localconfig["paths"] - mergedb = paths["mergedb"] + mergedb = paths["db"] currentsizefile = mergedb + "/fetched" create_ssl_context(cafile=paths["https_cacertfile"]) diff --git a/tools/mergestatus.py b/tools/mergestatus.py index 95cf2e8..9dbbb7b 100755 --- a/tools/mergestatus.py +++ b/tools/mergestatus.py @@ -22,7 +22,7 @@ def main(): args, config, localconfig = parse_args() paths = localconfig["paths"] mergenodes = config.get("mergenodes", []) - mergedb = paths["mergedb"] + mergedb = paths["db"] sthfile = mergedb + "/sth" currentsizefile = mergedb + "/fetched" diff --git a/tools/testcase1.py b/tools/testcase1.py index a616841..7ec853a 100755 --- a/tools/testcase1.py +++ b/tools/testcase1.py @@ -164,7 +164,7 @@ def mergestatus(configfile, localconfigfile): paths = localconfig["paths"] mergenodes = config.get("mergenodes", []) - mergedb = paths["mergedb"] + mergedb = paths["db"] sthfile = mergedb + "/sth" currentsizefile = mergedb + "/fetched" |