summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-05 15:30:10 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-05 15:30:10 +0100
commitb4f1cd31f49dff94b4006a6eeb3b2c27eb003dd4 (patch)
treed2010e6fb422a9d9cf96f7fb9044f9f7900e1c4a /docs
parentValidate federation server TLS certificates by default. (diff)
downloadsynapse-b4f1cd31f49dff94b4006a6eeb3b2c27eb003dd4.tar.xz
Update sample config
Diffstat (limited to 'docs')
-rw-r--r--docs/sample_config.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index 493ea9ee9e..d10a355d68 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -313,12 +313,12 @@ listeners:
 #
 #tls_private_key_path: "CONFDIR/SERVERNAME.tls.key"
 
-# Whether to verify TLS certificates when sending federation traffic.
+# Whether to verify TLS server certificates for outbound federation requests.
 #
-# This currently defaults to `false`, however this will change in
-# Synapse 1.0 when valid federation certificates will be required.
+# Defaults to `true`. To disable certificate verification, uncomment the
+# following line.
 #
-#federation_verify_certificates: true
+#federation_verify_certificates: false
 
 # Skip federation certificate verification on the following whitelist
 # of domains.