Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add config.signing_key_path. (#4974) 

As requested by @andrewshadura
This commit is contained in:
Richard van der Hoff 2019-04-02 16:59:27 +01:00 committed by GitHub
parent 297bf2547e
commit 8530090b16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4974.misc Normal file
View File

@ -0,0 +1 @@
Add `config.signing_key_path` that can be read by `synapse.config` utility.

3
synapse/config/key.py
View File

@ -42,7 +42,8 @@ class KeyConfig(Config):
if "signing_key" in config: if "signing_key" in config:
self.signing_key = read_signing_keys([config["signing_key"]]) self.signing_key = read_signing_keys([config["signing_key"]])
else: else:
self.signing_key = self.read_signing_key(config["signing_key_path"]) self.signing_key_path = config["signing_key_path"]
self.signing_key = self.read_signing_key(self.signing_key_path)
self.old_signing_keys = self.read_old_signing_keys( self.old_signing_keys = self.read_old_signing_keys(
config.get("old_signing_keys", {}) config.get("old_signing_keys", {})