diff options
| author | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-10-10 11:51:50 +0100 |
| commit | 9970f955ce1ab36d21f7824d9f1382ab1df778e5 (patch) | |
| tree | 94f824e633ac9b9fab18171a67a6b94aec2839a9 /synapse/config/key.py | |
| parent | Newsfile (diff) | |
| parent | Fix races in room stats (and other) updates. (#6187) (diff) | |
| download | synapse-9970f955ce1ab36d21f7824d9f1382ab1df778e5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/patch_inner
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index f039f96e9c..ec5d430afb 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -92,6 +92,8 @@ class TrustedKeyServer(object): class KeyConfig(Config): + section = "key" + def read_config(self, config, config_dir_path, **kwargs): # the signing key can be specified inline or in a separate file if "signing_key" in config: |