diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 17:55:36 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 17:55:36 +0000 |
| commit | 629a343c55ed5a486ea546e2cf256ac88445b656 (patch) | |
| tree | 5260bd64963d7872bbcc24412b643a969c5a0d5e /docs | |
| parent | Merge commit '1b23f991a' into release-v1.4.0 (diff) | |
| parent | Explicitly log when a homeserver does not have a trusted key server configure... (diff) | |
| download | synapse-629a343c55ed5a486ea546e2cf256ac88445b656.tar.xz | |
Explicitly log when a homeserver does not have a trusted key server configured (#6090)
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index eac74fca6d..6d637eda20 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1229,6 +1229,10 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key" # This setting supercedes an older setting named `perspectives`. The old format # is still supported for backwards-compatibility, but it is deprecated. # +# 'trusted_key_servers' defaults to matrix.org, but using it will generate a +# warning on start-up. To suppress this warning, set +# 'suppress_key_server_warning' to true. +# # Options for each entry in the list include: # # server_name: the name of the server. required. @@ -1253,11 +1257,13 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key" # "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr" # - server_name: "my_other_trusted_server.example.com" # -# The default configuration is: -# -#trusted_key_servers: -# - server_name: "matrix.org" +trusted_key_servers: + - server_name: "matrix.org" + +# Uncomment the following to disable the warning that is emitted when the +# trusted_key_servers include 'matrix.org'. See above. # +#suppress_key_server_warning: true # The signing keys to use when acting as a trusted key server. If not specified # defaults to the server signing key. |