Fix federation_custom_ca_list configuration option.

Previously, setting this option would cause an exception at startup.
matrix-org · Jun 5, 2019 · f8a4530 · f8a4530
1 parent 94f6c67
commit f8a4530
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/changelog.d/5362.bugfix 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
@@ -107,7 +107,7 @@ def read_config(self, 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:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix `federation_custom_ca_list` configuration option.