From f83a5bf9181651dbd2e2996e1beb5a07cfd5b355 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Fri, 22 Nov 2013 16:58:22 -0500 Subject: [PATCH] Some small cleanups to LDAP part of local_settings_template.py. (imported from commit 459aa101cda6e35a4ba41e25dc42f80950aa00af) --- zproject/local_settings_template.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zproject/local_settings_template.py b/zproject/local_settings_template.py index 64200befe7..60754cd681 100644 --- a/zproject/local_settings_template.py +++ b/zproject/local_settings_template.py @@ -22,7 +22,6 @@ DEPLOYMENT_ROLE_KEY = '' AUTHENTICATION_BACKENDS = ( # 'zproject.backends.EmailAuthBackend', # Email and password # 'zproject.backends.ZulipRemoteUserBackend', # Local SSO -# 'zproject.backends.ZulipLDAPAuthBackend', # LDAP authentication # 'zproject.backends.GoogleBackend', # Google Apps ) @@ -153,15 +152,16 @@ AUTH_LDAP_SERVER_URI = "" AUTH_LDAP_BIND_DN = "" AUTH_LDAP_BIND_PASSWORD = "" -# Specify the search base and the property to filter on that corrisponds to the +# Specify the search base and the property to filter on that corresponds to the # username. AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=users,dc=example,dc=com", ldap.SCOPE_SUBTREE, "(uid=%(user)s)") # If the value of a user's "uid" (or similar) property is not their email # address, specify the domain to append here. -LDAP_APPEND_DOMAIN = SSO_APPEND_DOMAIN +LDAP_APPEND_DOMAIN = ADMIN_DOMAIN +# This map defines how to populate attributes of a Zulip user from LDAP. AUTH_LDAP_USER_ATTR_MAP = { # Populate the Django user's name from the LDAP directory. "full_name": "cn",