Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 12:56:02 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'rav/fix_custom_ca' into rav/enable_tls_verification

Browse source
This commit is contained in:
Richard van der Hoff 2019-06-05 16:32:35 +01:00
commit 7603a706eb
28 changed files with 219 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/config/tls.py
View file

@ -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: