summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2015-07-08 18:30:59 +0100
committerMatthew Hodgson <matthew@matrix.org>2015-07-08 18:30:59 +0100
commit465acb0c6ac575c120c756486171aa701abaa4eb (patch)
tree8bdca622147d2a71235570cf659999c77eb804ec
parentadd new optional config for tls_certificate_chain_path for folks with interme... (diff)
downloadsynapse-465acb0c6ac575c120c756486171aa701abaa4eb.tar.xz
*cough*
-rw-r--r--synapse/config/tls.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index e04fe0d96c..945af38053 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -29,14 +29,15 @@ class TlsConfig(Config):
             "tls_certificate"
         )
 
-        tls_certificate_chain_path =
-            config.get("tls_certificate_chain_path")
+        tls_certificate_chain_path = config.get("tls_certificate_chain_path")
 
         if tls_certificate_chain_path and os.path.exists(tls_certificate_chain_path):
             self.tls_certificate_chain = self.read_tls_certificate(
                 config.get("tls_certificate_chain_path"),
                 "tls_certificate_chain"
             )
+        else:
+            self.tls_certificate_chain = None
 
         self.no_tls = config.get("no_tls", False)