summary refs log tree commit diff
path: root/synapse/config/tls.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-05 16:32:35 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-05 16:32:35 +0100
commit7603a706eb96305d804da05030a71288fcc255ab (patch)
treed59bcc7827bc6b038d5c3e7bc46677a84007e255 /synapse/config/tls.py
parentUpdate sample config (diff)
parentFix `federation_custom_ca_list` configuration option. (diff)
downloadsynapse-7603a706eb96305d804da05030a71288fcc255ab.tar.xz
Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification
Diffstat (limited to 'synapse/config/tls.py')
-rw-r--r--synapse/config/tls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py

index 43712b8213..658f9dd361 100644 --- a/synapse/config/tls.py +++ b/synapse/config/tls.py
@@ -107,7 +107,7 @@ class TlsConfig(Config): certs = [] for ca_file in custom_ca_list: logger.debug("Reading custom CA certificate file: %s", ca_file) - content = self.read_file(ca_file) + content = self.read_file(ca_file, "federation_custom_ca_list") # Parse the CA certificates try: