diff options
| author | Erik Johnston <erik@matrix.org> | 2019-08-27 11:51:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-27 11:51:37 +0100 |
| commit | f5b50d0871939d15620a8889b1ad384622c74a96 (patch) | |
| tree | 20963a7464a29abe1eea900979355cc6d8f76d31 /docs | |
| parent | Update 5909.misc (diff) | |
| parent | Don't implicitly include server signing key (diff) | |
| download | synapse-f5b50d0871939d15620a8889b1ad384622c74a96.tar.xz | |
Merge pull request #5895 from matrix-org/erikj/notary_key
Add config option to sign remote key query responses with a separate key.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 0c6be30e51..ae1cafc5f3 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1027,6 +1027,14 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key" # #trusted_key_servers: # - server_name: "matrix.org" +# + +# The signing keys to use when acting as a trusted key server. If not specified +# defaults to the server signing key. +# +# Can contain multiple keys, one per line. +# +#key_server_signing_keys_path: "key_server_signing_keys.key" # Enable SAML2 for registration and login. Uses pysaml2. |