1 files changed, 3 insertions, 19 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index 26f1150ca5..0e9bba53c9 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -215,28 +215,12 @@ class TlsConfig(Config):
days_remaining = (expires_on - now).days
return days_remaining
- def read_certificate_from_disk(self, require_cert_and_key: bool):
+ def read_certificate_from_disk(self):
"""
Read the certificates and private key from disk.
-
- Args:
- require_cert_and_key: set to True to throw an error if the certificate
- and key file are not given
"""
- if require_cert_and_key:
- self.tls_private_key = self.read_tls_private_key()
- self.tls_certificate = self.read_tls_certificate()
- elif self.tls_certificate_file:
- # we only need the certificate for the tls_fingerprints. Reload it if we
- # can, but it's not a fatal error if we can't.
- try:
- self.tls_certificate = self.read_tls_certificate()
- except Exception as e:
- logger.info(
- "Unable to read TLS certificate (%s). Ignoring as no "
- "tls listeners enabled.",
- e,
- )
+ self.tls_private_key = self.read_tls_private_key()
+ self.tls_certificate = self.read_tls_certificate()
def generate_config_section(
self,
|
