summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2015-07-09 00:06:01 +0100
committerMatthew Hodgson <matthew@matrix.org>2015-07-09 00:06:01 +0100
commit8ad2d2d1cb679484dcffc7bacfd9c1de3f6dad38 (patch)
tree700528c6198ea72b0720eab8c6f28dedeef7b92c /synapse
parentoops, context.tls_certificate_chain_file() expects a file, not a certificate. (diff)
downloadsynapse-8ad2d2d1cb679484dcffc7bacfd9c1de3f6dad38.tar.xz
document tls_certificate_chain_path more clearly
Diffstat (limited to 'synapse')
-rw-r--r--synapse/config/tls.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index 5fef63846d..de57d0d0ed 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -62,6 +62,11 @@ class TlsConfig(Config):
         tls_certificate_path: "%(tls_certificate_path)s"
 
         # PEM encoded X509 intermediary certificate file for TLS (optional)
+        # This *must* be a concatenation of the tls_certificate pointed to
+        # by tls_certificate_path followed by the intermediary certificates
+        # in hierarchical order.  If specified this option overrides the
+        # tls_certificate_path parameter.
+        #
         # tls_certificate_chain_path: "%(tls_certificate_chain_path)s"
 
         # PEM encoded private key for TLS