Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add tls property

This commit is contained in:
Christoph Witzany 2016-04-06 16:57:54 +02:00
parent 7b9319b1c8
commit 92767dd703
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
synapse/config/ldap.py
View File

@ -23,6 +23,7 @@ class LDAPConfig(Config):
self.ldap_enabled = ldap_config.get("enabled", False) self.ldap_enabled = ldap_config.get("enabled", False)
self.ldap_server = ldap_config["server"] self.ldap_server = ldap_config["server"]
self.ldap_port = ldap_config["port"] 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_base = ldap_config["search_base"]
self.ldap_search_property = ldap_config["search_property"] self.ldap_search_property = ldap_config["search_property"]
self.ldap_email_property = ldap_config["email_property"] self.ldap_email_property = ldap_config["email_property"]
@ -31,6 +32,7 @@ class LDAPConfig(Config):
self.ldap_enabled = False self.ldap_enabled = False
self.ldap_server = None self.ldap_server = None
self.ldap_port = None self.ldap_port = None
self.ldap_tls = False
self.ldap_search_base = None self.ldap_search_base = None
self.ldap_search_property = None self.ldap_search_property = None
self.ldap_email_property = None self.ldap_email_property = None
@ -39,10 +41,12 @@ class LDAPConfig(Config):
def default_config(self, **kwargs): def default_config(self, **kwargs):
return """\ return """\
# ldap_config: # ldap_config:
# server: "ldap://localhost" # enabled: true
# port: 389 # server: "ldap://localhost"
# search_base: "ou=Users,dc=example,dc=com" # port: 389
# search_property: "cn" # tls: false
# email_property: "email" # search_base: "ou=Users,dc=example,dc=com"
# full_name_property: "givenName" # search_property: "cn"
# email_property: "email"
# full_name_property: "givenName"
""" """