summaryrefslogtreecommitdiff
path: root/tools/compileconfig.py
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-03-27 03:08:06 +0100
committerLinus Nordberg <linus@nordberg.se>2015-03-27 11:47:26 +0100
commit6cd3c80c61711cabf9e308da1963b56f6dd49cfd (patch)
tree8d6964fa971f5c38d6d3da2507e0731e4d46b12f /tools/compileconfig.py
parent0fffec2394f2d1962b44eaea4786f9ad69dea901 (diff)
Handle multiple signing nodes
Diffstat (limited to 'tools/compileconfig.py')
-rwxr-xr-xtools/compileconfig.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/compileconfig.py b/tools/compileconfig.py
index e3d9ee0..52f10e8 100755
--- a/tools/compileconfig.py
+++ b/tools/compileconfig.py
@@ -192,7 +192,8 @@ def gen_config(nodename, config, localconfig):
(Symbol("catlfish"), Symbol("entryhash_from_entry"))),
]
- signingnode = config["signingnodes"][0]
+ signingnodes = config["signingnodes"]
+ signingnodeaddresses = ["https://%s/ct/signing/" % node["address"] for node in config["signingnodes"]]
mergenodenames = [node["name"] for node in config["mergenodes"]]
storagenodeaddresses = ["https://%s/ct/storage/" % node["address"] for node in config["storagenodes"]]
frontendnodenames = [node["name"] for node in config["frontendnodes"]]
@@ -207,7 +208,7 @@ def gen_config(nodename, config, localconfig):
services = [Symbol("ht")]
allowed_clients += allowed_clients_frontend(mergenodenames)
allowed_clients += allowed_clients_public()
- allowed_servers += allowed_servers_frontend([signingnode["name"]], storagenodenames)
+ allowed_servers += allowed_servers_frontend([node["name"] for node in signingnodes], storagenodenames)
elif nodetype == "storagenodes":
allowed_clients += allowed_clients_storage(frontendnodenames, mergenodenames)
services = []
@@ -226,7 +227,7 @@ def gen_config(nodename, config, localconfig):
(Symbol("own_key"), (nodename, "%s/%s-private.pem" % (paths["privatekeys"], nodename))),
]
if nodetype == "frontendnodes":
- plopconfig.append((Symbol("signing_node"), "https://%s/ct/signing/" % signingnode["address"]))
+ plopconfig.append((Symbol("signing_nodes"), signingnodeaddresses))
plopconfig += [
(Symbol("allowed_clients"), allowed_clients),
(Symbol("allowed_servers"), allowed_servers),