summaryrefslogtreecommitdiff
path: root/tools/merge_dist.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2017-07-25 13:32:26 +0200
committerMagnus Ahltorp <map@kth.se>2017-07-25 13:32:26 +0200
commit5105a511348e58629b394373730f9bf91c3e888e (patch)
tree2ebc9618315ef7e1c520ebbe3baf7b9a51830e8f /tools/merge_dist.py
parent24569ff28412cb1b439070e83caa3bbb5fbd01c5 (diff)
Change paths/mergedb to paths/db in local configdocgen2
Remove unused config variable paths/publickeys
Diffstat (limited to 'tools/merge_dist.py')
-rwxr-xr-xtools/merge_dist.py2
1 files changed, 1 insertions, 1 deletions
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"