summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-11 22:01:27 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-11 22:01:27 +0000
commit0ca290865350212e1834730c918973162a3067f4 (patch)
tree9aecae58476c7fa957324ea960bdcc4a24158c59 /synapse
parentInfer no_tls from presence of TLS listeners (diff)
downloadsynapse-0ca290865350212e1834730c918973162a3067f4.tar.xz
fix tests
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/tls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index e37a41eff4..86e6eb80db 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -111,7 +111,7 @@ class TlsConfig(Config):
         """
         self.tls_certificate = self.read_tls_certificate()
 
-        if not self.no_tls:
+        if self.has_tls_listener():
             self.tls_private_key = self.read_tls_private_key()
 
         self.tls_fingerprints = list(self._original_tls_fingerprints)