diff options
| author | Erik Johnston <erik@matrix.org> | 2019-04-17 19:44:40 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-04-17 19:44:40 +0100 |
| commit | ca90336a6935b36b5761244005b0f68b496d5d79 (patch) | |
| tree | 6bbce5eafc0db3b24ccc3b59b051da850382ae09 /synapse/config/key.py | |
| parent | Add management endpoints for account validity (diff) | |
| parent | Merge pull request #5047 from matrix-org/babolivier/account_expiration (diff) | |
| download | synapse-ca90336a6935b36b5761244005b0f68b496d5d79.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into babolivier/account_expiration
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 933928885a..eb10259818 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -42,7 +42,8 @@ class KeyConfig(Config): if "signing_key" in config: self.signing_key = read_signing_keys([config["signing_key"]]) 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( config.get("old_signing_keys", {}) |