add tls property

1 files changed, 10 insertions, 6 deletions

diff --git a/synapse/config/ldap.py b/synapse/config/ldap.py
index 86528139e2..9c14593a99 100644
--- a/synapse/config/ldap.py
+++ b/synapse/config/ldap.py
@@ -23,6 +23,7 @@ class LDAPConfig(Config):
             self.ldap_enabled = ldap_config.get("enabled", False)
             self.ldap_server = ldap_config["server"]
             self.ldap_port = ldap_config["port"]
+            self.ldap_tls = ldap_config.get("tls", False)
             self.ldap_search_base = ldap_config["search_base"]
             self.ldap_search_property = ldap_config["search_property"]
             self.ldap_email_property = ldap_config["email_property"]
@@ -31,6 +32,7 @@ class LDAPConfig(Config):
             self.ldap_enabled = False
             self.ldap_server = None
             self.ldap_port = None
+            self.ldap_tls = False
             self.ldap_search_base = None
             self.ldap_search_property = None
             self.ldap_email_property = None
@@ -39,10 +41,12 @@ class LDAPConfig(Config):
     def default_config(self, **kwargs):
         return """\
         # ldap_config:
-        #    server: "ldap://localhost"
-        #    port: 389
-        #    search_base: "ou=Users,dc=example,dc=com"
-        #    search_property: "cn"
-        #    email_property: "email"
-        #    full_name_property: "givenName"
+        #   enabled: true
+        #   server: "ldap://localhost"
+        #   port: 389
+        #   tls: false
+        #   search_base: "ou=Users,dc=example,dc=com"
+        #   search_property: "cn"
+        #   email_property: "email"
+        #   full_name_property: "givenName"
         """