diff options
| author | Erik Johnston <erik@matrix.org> | 2014-10-20 17:53:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-10-20 17:53:18 +0100 |
| commit | 4ae0844ee3128cf4cfdcaf87216ba69f8eb1bf5d (patch) | |
| tree | 4c40d64dcf344cbfe021d3349e83d2e236f4c49f /synapse/config/server.py | |
| parent | more timestamp fixes (diff) | |
| parent | use a tagged version of syutil rather than master (diff) | |
| download | synapse-4ae0844ee3128cf4cfdcaf87216ba69f8eb1bf5d.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/config/server.py')
| -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 d9d8d0e14e..9332e4acd7 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -94,7 +94,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.SigningKey.generate("auto"),), + (syutil.crypto.signing_key.generate_singing_key("auto"),), ) else: signing_keys = cls.read_file(args.signing_key_path, "signing_key") |