Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-06-17 14:09:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Pass config_dir_path and data_dir_path into Config.read_config. (#5522)

Browse source 
* Pull config_dir_path and data_dir_path calculation out of read_config_files

* Pass config_dir_path and data_dir_path into read_config
This commit is contained in:
Richard van der Hoff 2019-06-24 11:34:45 +01:00 • committed by GitHub
parent 21bf4318b5
commit c3c6b00d95
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 104 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/config/key.py
View file

@ -65,7 +65,7 @@ class TrustedKeyServer(object):
class KeyConfig(Config):
def read_config(self, config):
def read_config(self, config, **kwargs):
# the signing key can be specified inline or in a separate file
if "signing_key" in config:
self.signing_key = read_signing_keys([config["signing_key"]])