diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-04-02 16:59:27 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-02 16:59:27 +0100 |
commit | 8530090b1692b1cb75046cc0d7e69422a3352067 (patch) | |
tree | c3acabef8ab25a66b51222237d92de2fb66b3a4f | |
parent | Fix sync bug when accepting invites (#4956) (diff) | |
download | synapse-8530090b1692b1cb75046cc0d7e69422a3352067.tar.xz |
Add config.signing_key_path. (#4974)
As requested by @andrewshadura
-rw-r--r-- | changelog.d/4974.misc | 1 | ||||
-rw-r--r-- | synapse/config/key.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/4974.misc b/changelog.d/4974.misc new file mode 100644 index 0000000000..672a18923a --- /dev/null +++ b/changelog.d/4974.misc @@ -0,0 +1 @@ +Add `config.signing_key_path` that can be read by `synapse.config` utility. 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", {}) |