aboutsummaryrefslogtreecommitdiffstats
path: root/modules/transifex/templates
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2010-12-15 21:24:26 +0000
committerMichael Scherer <misc@mageia.org>2010-12-15 21:24:26 +0000
commitc41357a607659099be05c5ada092cf343b08560c (patch)
tree87f49f61cea32e31422d8ae14c50aaeae206d8c5 /modules/transifex/templates
parentdb6bb8f84629ddac88b1e658da946a3f595e013f (diff)
downloadpuppet-c41357a607659099be05c5ada092cf343b08560c.tar
puppet-c41357a607659099be05c5ada092cf343b08560c.tar.gz
puppet-c41357a607659099be05c5ada092cf343b08560c.tar.bz2
puppet-c41357a607659099be05c5ada092cf343b08560c.tar.xz
puppet-c41357a607659099be05c5ada092cf343b08560c.zip
allow to use email on log on transifex
Diffstat (limited to 'modules/transifex/templates')
-rw-r--r--modules/transifex/templates/45-ldap.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/transifex/templates/45-ldap.conf b/modules/transifex/templates/45-ldap.conf
index ea487d70..e3e3877d 100644
--- a/modules/transifex/templates/45-ldap.conf
+++ b/modules/transifex/templates/45-ldap.conf
@@ -1,5 +1,5 @@
AUTHENTICATION_BACKENDS = (
- 'django_auth_ldap.backend.LDAPBackend',
+ 'custom_backend.ForceUidLDAPBackend',
'django.contrib.auth.backends.ModelBackend',
)
@@ -23,7 +23,7 @@ AUTH_LDAP_BIND_DN = "cn=alamut-sympa,ou=System Accounts,<%= dc_suffix %>"
AUTH_LDAP_BIND_PASSWORD = "<%= ldap_password %>"
AUTH_LDAP_USER_SEARCH = LDAPSearch("ou=People,<%= dc_suffix %> ",
- ldap.SCOPE_SUBTREE, "(uid=%(user)s)")
+ ldap.SCOPE_SUBTREE, "(|(uid=%(user)s)(mail=%(user)s))")
# Set up the basic group parameters.
AUTH_LDAP_GROUP_SEARCH = LDAPSearch("ou=Group,<%= dc_suffix %>",