diff options
author | Erik Johnston <erik@matrix.org> | 2015-05-19 13:20:29 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-05-19 13:20:29 +0100 |
commit | 118a76071994343364cc347e9a78c295d09a8bfe (patch) | |
tree | 10342d1169614792cacdcc2fef45afcd62b29a98 /scripts-dev/convert_server_keys.py | |
parent | SYN-383: Actually, we expect this value to be a dict (diff) | |
parent | Disable GZip encoding on static file resources as per comment (diff) | |
download | synapse-118a76071994343364cc347e9a78c295d09a8bfe.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/join_perf
Diffstat (limited to 'scripts-dev/convert_server_keys.py')
-rw-r--r-- | scripts-dev/convert_server_keys.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py index 024ddcdbd0..a1ee39059c 100644 --- a/scripts-dev/convert_server_keys.py +++ b/scripts-dev/convert_server_keys.py @@ -47,7 +47,10 @@ def convert_v1_to_v2(server_name, valid_until, keys, certificate): return { "old_verify_keys": {}, "server_name": server_name, - "verify_keys": keys, + "verify_keys": { + key_id: {"key": key} + for key_id, key in keys.items() + }, "valid_until_ts": valid_until, "tls_fingerprints": [fingerprint(certificate)], } |