mravi/uncloud-mravi
1
0
Fork 0
forked from uncloud/uncloud
Code Issues Pull requests Projects Releases Wiki Activity

-- merge conflict

Browse source
This commit is contained in:
Nico Schottelius 2020-02-23 17:20:28 +01:00
parent 2900844f63
commit 8c6e4eee00
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
uncloud/uncloud/settings.py
View file

@ -111,14 +111,7 @@ AUTH_PASSWORD_VALIDATORS = [
################################################################################ ################################################################################
# AUTH/LDAP # AUTH/LDAP
<<<<<<< HEAD
import ldap
from django_auth_ldap.config import LDAPSearch
AUTH_LDAP_SERVER_URI = uncloud.secrets.LDAP_SERVER_URI AUTH_LDAP_SERVER_URI = uncloud.secrets.LDAP_SERVER_URI
=======
AUTH_LDAP_SERVER_URI = "ldaps://ldap1.ungleich.ch,ldaps://ldap2.ungleich.ch"
>>>>>>> ahmed/master
AUTH_LDAP_USER_ATTR_MAP = { AUTH_LDAP_USER_ATTR_MAP = {
"first_name": "givenName", "first_name": "givenName",
@ -126,15 +119,10 @@ AUTH_LDAP_USER_ATTR_MAP = {
"email": "mail" "email": "mail"
} }
<<<<<<< HEAD
AUTH_LDAP_BIND_DN = uncloud.secrets.LDAP_ADMIN_DN AUTH_LDAP_BIND_DN = uncloud.secrets.LDAP_ADMIN_DN
AUTH_LDAP_BIND_PASSWORD = uncloud.secrets.LDAP_ADMIN_PASSWORD AUTH_LDAP_BIND_PASSWORD = uncloud.secrets.LDAP_ADMIN_PASSWORD
=======
AUTH_LDAP_BIND_DN = secrets.AUTH_LDAP_BIND_DN
AUTH_LDAP_BIND_PASSWORD = secrets.AUTH_LDAP_BIND_PASSWORD
>>>>>>> ahmed/master
AUTH_LDAP_USER_SEARCH = LDAPSearch( AUTH_LDAP_USER_SEARCH = LDAPSearch(
"dc=ungleich,dc=ch", ldap.SCOPE_SUBTREE, "(uid=%(user)s)" "dc=ungleich,dc=ch", ldap.SCOPE_SUBTREE, "(uid=%(user)s)"
) )