summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--changelog.d/5362.bugfix1
-rw-r--r--synapse/config/tls.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/5362.bugfix b/changelog.d/5362.bugfix
new file mode 100644

index 0000000000..1c8b19182c --- /dev/null +++ b/changelog.d/5362.bugfix
@@ -0,0 +1 @@ +Fix `federation_custom_ca_list` configuration option. 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: