diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-09-25 15:55:17 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-09-25 15:55:17 +0100 |
| commit | bdc578f59ae1ef42c24d214f964d0685c2b20bfd (patch) | |
| tree | 144a2d1ad4ed39bbd42d22bb388b2923267ad26e | |
| parent | clarity and refactor (diff) | |
| download | synapse-bdc578f59ae1ef42c24d214f964d0685c2b20bfd.tar.xz | |
Update sample config
| -rw-r--r-- | docs/sample_config.yaml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 121025b537..422c25065e 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1061,6 +1061,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. @@ -1084,15 +1088,11 @@ signing_key_path: "CONFDIR/SERVERNAME.signing.key" # verify_keys: # "ed25519:auto": "abcdefghijklmnopqrstuvwxyzabcdefghijklmopqr" # - server_name: "my_other_trusted_server.example.com" - +# trusted_key_servers: -- server_name: "matrix.org" - -# '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. + - server_name: "matrix.org" # -#suppress_key_server_warning: True +#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. |