From 03b95596ecc425cfbb0d29d40ba9accbc9e67729 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 20 Aug 2015 17:35:25 +0200 Subject: Follow internal HTTP API URL changes. --- tools/compileconfig.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'tools/compileconfig.py') diff --git a/tools/compileconfig.py b/tools/compileconfig.py index d493226..eb0ddc6 100755 --- a/tools/compileconfig.py +++ b/tools/compileconfig.py @@ -115,21 +115,21 @@ def gen_http_servers(nodetype, nodeconfig, bind_address, bind_publicaddress, bin def allowed_clients_frontend(mergenodenames, primarymergenode): return [ - ("/ct/frontend/sendentry", mergenodenames), - ("/ct/frontend/sendlog", mergenodenames), - ("/ct/frontend/sendsth", [primarymergenode]), - ("/ct/frontend/currentposition", mergenodenames), - ("/ct/frontend/missingentries", mergenodenames), + ("/plop/v1/frontend/sendentry", mergenodenames), + ("/plop/v1/frontend/sendlog", mergenodenames), + ("/plop/v1/frontend/sendsth", [primarymergenode]), + ("/plop/v1/frontend/currentposition", mergenodenames), + ("/plop/v1/frontend/missingentries", mergenodenames), ] def allowed_clients_mergesecondary(primarymergenode): return [ - ("/catlfish/merge/sendentry", [primarymergenode]), - ("/catlfish/merge/sendlog", [primarymergenode]), - ("/catlfish/merge/verifyroot", [primarymergenode]), - ("/catlfish/merge/verifiedsize", [primarymergenode]), - ("/catlfish/merge/setverifiedsize", [primarymergenode]), - ("/catlfish/merge/missingentries", [primarymergenode]), + ("/plop/v1/merge/sendentry", [primarymergenode]), + ("/plop/v1/merge/sendlog", [primarymergenode]), + ("/plop/v1/merge/verifyroot", [primarymergenode]), + ("/plop/v1/merge/verifiedsize", [primarymergenode]), + ("/plop/v1/merge/setverifiedsize", [primarymergenode]), + ("/plop/v1/merge/missingentries", [primarymergenode]), ] def allowed_clients_public(): @@ -147,23 +147,23 @@ def allowed_clients_public(): def allowed_clients_signing(frontendnodenames, primarymergenode): return [ - ("/ct/signing/sct", frontendnodenames), - ("/ct/signing/sth", [primarymergenode]), + ("/plop/v1/signing/sct", frontendnodenames), + ("/plop/v1/signing/sth", [primarymergenode]), ] def allowed_clients_storage(frontendnodenames, mergenodenames): return [ - ("/ct/storage/sendentry", frontendnodenames), - ("/ct/storage/entrycommitted", frontendnodenames), - ("/ct/storage/fetchnewentries", mergenodenames), - ("/ct/storage/getentry", mergenodenames), + ("/plop/v1/storage/sendentry", frontendnodenames), + ("/plop/v1/storage/entrycommitted", frontendnodenames), + ("/plop/v1/storage/fetchnewentries", mergenodenames), + ("/plop/v1/storage/getentry", mergenodenames), ] def allowed_servers_frontend(signingnodenames, storagenodenames): return [ - ("/ct/storage/sendentry", storagenodenames), - ("/ct/storage/entrycommitted", storagenodenames), - ("/ct/signing/sct", signingnodenames), + ("/plop/v1/storage/sendentry", storagenodenames), + ("/plop/v1/storage/entrycommitted", storagenodenames), + ("/plop/v1/signing/sct", signingnodenames), ] def parse_ratelimit_expression(expression): @@ -263,10 +263,10 @@ def gen_config(nodename, config, localconfig): ] signingnodes = config["signingnodes"] - signingnodeaddresses = ["https://%s/ct/signing/" % node["address"] for node in config["signingnodes"]] + signingnodeaddresses = ["https://%s/plop/v1/signing/" % node["address"] for node in config["signingnodes"]] mergenodenames = [node["name"] for node in config["mergenodes"]] primarymergenode = config["primarymergenode"] - storagenodeaddresses = ["https://%s/ct/storage/" % node["address"] for node in config["storagenodes"]] + storagenodeaddresses = ["https://%s/plop/v1/storage/" % node["address"] for node in config["storagenodes"]] frontendnodenames = [node["name"] for node in config["frontendnodes"]] allowed_clients = [] -- cgit v1.1