diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-04-01 15:06:58 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-04-01 15:06:58 +0100 |
| commit | 2851e647e9e01f67b86d409f0bba331d464102b6 (patch) | |
| tree | 5118e68b716e154be1e99abd820ec2306375e308 | |
| parent | words (diff) | |
| download | synapse-2851e647e9e01f67b86d409f0bba331d464102b6.tar.xz | |
Generate config and remove extra newline
| -rw-r--r-- | docs/sample_config.yaml | 23 | ||||
| -rw-r--r-- | synapse/config/tls.py | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 4ada0fba0e..4ffe016202 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -257,6 +257,29 @@ listeners: # #tls_private_key_path: "CONFDIR/SERVERNAME.tls.key" +# Whether to verify TLS certificates when sending federation traffic. +# +#federation_verify_certificates: true + +# Prevent federation certificate validation on the following whitelist +# of domains. Only effective if federation_verify_certicates is true. +# +#federation_certificate_validation_whitelist: +# - lon.example.com +# - nyc.example.com +# - syd.example.com + + +# List of custom certificate authorities for federation traffic. +# +# Note that this list will replace those that are provided by your +# operating environment. Certificates must be in PEM format. +# +#federation_custom_ca_list: +# - myCA1.pem +# - myCA2.pem +# - myCA3.pem + # ACME support: This will configure Synapse to request a valid TLS certificate # for your configured `server_name` via Let's Encrypt. # diff --git a/synapse/config/tls.py b/synapse/config/tls.py index 63ee3386ed..f799ff780f 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py @@ -248,7 +248,6 @@ class TlsConfig(Config): # - nyc.example.com # - syd.example.com - # List of custom certificate authorities for federation traffic. # # Note that this list will replace those that are provided by your |