summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-06-05 16:16:33 +0100
committerRichard van der Hoff <richard@matrix.org>2019-06-05 16:19:07 +0100
commitf8a45302c9ce147d7797ceb9e3757bd3b2af6b99 (patch)
treeb7b8f4ce7048ff11393031a5069ccf6d14ef6f91 /synapse
parentNeilj/add r0.5 to versions (#5360) (diff)
downloadsynapse-f8a45302c9ce147d7797ceb9e3757bd3b2af6b99.tar.xz
Fix `federation_custom_ca_list` configuration option.
Previously, setting this option would cause an exception at startup.
Diffstat (limited to 'synapse')
-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 72dd5926f9..94a53d05f9 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: