summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2018-03-27 11:24:45 -0500
committerMonty Taylor <mordred@inaugust.com>2018-03-28 09:52:54 -0500
commit9b57c4a68e3e5c8d5c2e14cc6df1705b8fe84c71 (patch)
treeab56eec0fbde697372e39cb89b22b6776afdd418 /tools
parentffe36ad95b75aa384c7af044fc9fb8608d56aab7 (diff)
downloadzuul-9b57c4a68e3e5c8d5c2e14cc6df1705b8fe84c71.tar.gz
Reorganize REST API and dashboard urls
The existing structure with the API and HTML interleaved makes it hard to have apache do html offloading for whitelabeled deploys (like openstack's) where the api and web are served from the same host. Similarly, the tenant selector in the url for the html content being bare and not prefixed by anything makes it harder to pull routing information javascript-side. Introduce an 'api' prefix to the REST API calls so that we can apply rewrite rules differently for things starting with /api than things that don't. Add the word 'tenant' before each tenant subpath. Also add a '/t/' to the url for the html, so that we have anchors for routing regexes but the urls don't get too long and unweildy. Finally, also add /key as a prefix to the key route for similar reasons. Change-Id: I0cbbf6f1958e91b5910738da9b4fb4c563d48dd4
Diffstat (limited to 'tools')
-rwxr-xr-xtools/encrypt_secret.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/encrypt_secret.py b/tools/encrypt_secret.py
index 45ad68ca6..f086402d9 100755
--- a/tools/encrypt_secret.py
+++ b/tools/encrypt_secret.py
@@ -70,7 +70,7 @@ def main():
"unencrypted connection. Your secret may get "
"compromised.\n")
- req = Request("%s/%s.pub" % (args.url.rstrip('/'), args.project))
+ req = Request("%s/key/%s.pub" % (args.url.rstrip('/'), args.project))
pubkey = urlopen(req)
if args.infile: