diff options
| author | Erik Johnston <erik@matrix.org> | 2015-04-15 10:27:20 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-04-15 10:27:20 +0100 |
| commit | 6606f7c659b7271eda2eb177cd111094d37e5215 (patch) | |
| tree | a86fa67c08939849322897a85b7b6a7a452cb255 /synapse/config | |
| parent | Use try..finally in contextlib.contextmanager (diff) | |
| parent | Merge pull request #122 from matrix-org/upgrade_syutil_to_0.0.4 (diff) | |
| download | synapse-6606f7c659b7271eda2eb177cd111094d37e5215.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into postgres
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 58a828cc4c..d4c223f348 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -110,7 +110,7 @@ class ServerConfig(Config): with open(args.signing_key_path, "w") as signing_key_file: syutil.crypto.signing_key.write_signing_keys( signing_key_file, - (syutil.crypto.signing_key.generate_singing_key("auto"),), + (syutil.crypto.signing_key.generate_signing_key("auto"),), ) else: signing_keys = cls.read_file(args.signing_key_path, "signing_key") |