diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-21 11:31:53 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-21 11:31:53 +0000 |
| commit | 265bcb1e68a51ddd1f485966d1179fa52adf4475 (patch) | |
| tree | 3930d62ee92f66388a6030174341ffc49bf891ba /docs | |
| parent | Merge pull request #5909 from aaronraimist/public_base_url (diff) | |
| parent | Merge pull request #5895 from matrix-org/erikj/notary_key (diff) | |
| download | synapse-265bcb1e68a51ddd1f485966d1179fa52adf4475.tar.xz | |
Merge pull request #5895 from matrix-org/erikj/notary_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 32db620853..62cfd363c7 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1184,6 +1184,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. |