diff options
| author | Neil Johnson <neil@matrix.org> | 2019-09-26 12:57:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-09-26 12:57:01 +0100 |
| commit | 8b8f8c7b3c6136ea777265fff8052afed2b7031e (patch) | |
| tree | 8bcd312859bf4141b5e204f64033411a5a5e2a85 /docs/sample_config.yaml | |
| parent | Merge commit '1b23f991a' into release-v1.4.0 (diff) | |
| download | synapse-8b8f8c7b3c6136ea777265fff8052afed2b7031e.tar.xz | |
Explicitly log when a homeserver does not have a trusted key server configured (#6090)
Diffstat (limited to 'docs/sample_config.yaml')
| -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 8f801daf35..254e1b17b4 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1072,6 +1072,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. @@ -1096,11 +1100,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. |