|
@@ -79,7 +79,7 @@ ldapConfig=$(cat <<EOF
|
|
"Enabled" : true,
|
|
"Enabled" : true,
|
|
"CachePW" : false,
|
|
"CachePW" : false,
|
|
"URI" : "ldap://${LDAP_SERVER}:${LDAP_PORT}/${LDAP_USERS_BASE_DN}",
|
|
"URI" : "ldap://${LDAP_SERVER}:${LDAP_PORT}/${LDAP_USERS_BASE_DN}",
|
|
- "Filter" : "(&(objectClass=user)(username=%s))",
|
|
|
|
|
|
+ "Filter" : "(|(email=%1\$s)(username=%1\$s))",
|
|
"NameAttr" : "displayname",
|
|
"NameAttr" : "displayname",
|
|
"SecName" : "",
|
|
"SecName" : "",
|
|
"UidAttr" : "uid",
|
|
"UidAttr" : "uid",
|
|
@@ -88,7 +88,7 @@ ldapConfig=$(cat <<EOF
|
|
"Groups" : { "administrator" : "cn=admins,${LDAP_GROUPS_BASE_DN}" },
|
|
"Groups" : { "administrator" : "cn=admins,${LDAP_GROUPS_BASE_DN}" },
|
|
"Debug" : false,
|
|
"Debug" : false,
|
|
"GroupAttr" : "memberof",
|
|
"GroupAttr" : "memberof",
|
|
- "GroupFilter" : "(&(objectClass=user)(username=%s))",
|
|
|
|
|
|
+ "GroupFilter" : "(|(email=%1\$s)(username=%1\$s))",
|
|
"DefaultRole" : "editor",
|
|
"DefaultRole" : "editor",
|
|
"GroupEnable" : true,
|
|
"GroupEnable" : true,
|
|
"GroupOverUser" : true,
|
|
"GroupOverUser" : true,
|