From 10c956121a86ed6bac5401e0a35d9ac5b2086916 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 9 May 2022 11:35:25 +0200 Subject: [PATCH] Revert "bring back uid,mail as login attributes" This reverts commit 17a97f48cd128a863228f721c84715182612ef8e. --- .drone.star | 2 +- deployments/examples/oc10_ocis_parallel/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index bed3a13d4..860709714 100644 --- a/.drone.star +++ b/.drone.star @@ -1686,7 +1686,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = "LDAP_GROUP_SCHEMA_MAIL": "mail", "LDAP_GROUP_SCHEMA_MEMBER": "cn", "LDAP_GROUPFILTER": "(objectclass=owncloud)", - "LDAP_LOGIN_ATTRIBUTES": "uid,mail", + "LDAP_LOGIN_ATTRIBUTES": "uid", "LDAP_USER_BASE_DN": "ou=TestUsers,dc=owncloud,dc=com", "LDAP_USER_OBJECTCLASS": "posixAccount", "LDAP_USER_SCHEMA_DISPLAYNAME": "displayname", diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index f08ecba82..7a74976a4 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -91,7 +91,7 @@ services: LDAP_GROUP_SCHEMA_MAIL: "mail" LDAP_GROUP_SCHEMA_MEMBER: "cn" LDAP_GROUPFILTER: "(objectclass=owncloud)" - LDAP_LOGIN_ATTRIBUTES: "uid,mail" + LDAP_LOGIN_ATTRIBUTES: "uid" LDAP_USER_BASE_DN: "ou=users,dc=owncloud,dc=com" LDAP_USER_OBJECTCLASS: "posixAccount" LDAP_USER_SCHEMA_DISPLAYNAME: "displayname"