Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5362 from matrix-org/rav/fix_custom_ca 

Fix `federation_custom_ca_list` configuration option.
This commit is contained in:
Richard van der Hoff 2019-06-05 22:54:41 +01:00 committed by GitHub
parent 94f6c674df f8a45302c9
commit a39be79216
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5362.bugfix Normal file
View File

@ -0,0 +1 @@
Fix `federation_custom_ca_list` configuration option.

2
synapse/config/tls.py
View File

@ -107,7 +107,7 @@ class TlsConfig(Config):
certs = [] certs = []
for ca_file in custom_ca_list: for ca_file in custom_ca_list:
logger.debug("Reading custom CA certificate file: %s", ca_file) 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 # Parse the CA certificates
try: try: