Merge branch '2.8.0/master'

This commit is contained in:
Matthieu Lamalle 2020-12-14 14:04:43 +01:00
commit bb18f68a54
2 changed files with 8 additions and 24 deletions

View File

@ -35,8 +35,8 @@
</fill>
<auto name='calc_val' target='ldap_port'>
<param>636</param>
</auto>
<param>389</param>
</auto>
<condition name='frozen_if_in' source='activerLemon'>
<param>oui</param>
@ -48,17 +48,19 @@
</auto>
<auto name='calc_val' target='ldapServerPort'>
<param type='number'>636</param>
<param type='number'>389</param>
</auto>
<auto name='calc_val' target='lemon_user_db'>
<param>AD</param>
<param>LDAP</param>
</auto>
<auto name='calc_val' target='llRegisterDB'>
<param>AD</param>
<param>LDAP</param>
</auto>
<auto name='calc_val' target='ldapUserBaseDN'>
<param type='eole'>ldap_base_dn</param>
</auto>
<auto name='calc_val' target='ldapBindUserDN'>
<param type='eole'>sasl_ldap_reader</param>
</auto>

View File

@ -171,19 +171,6 @@
%end if
"ldapAuthnLevel": 2,
"ldapSearchDeref": "find",
%if %%eole_module == "scribe"
"ldapBase": "cn=Users,dc=%echo ",dc=".join(%%ad_domain.split('.')) + '",'
"ldapExportedVars": {
"cn": "cn",
"mail": "mail",
"uid": "cn"
},
"ldapGroupAttributeName": "memberUid",
"ldapGroupAttributeNameGroup": "dn",
"ldapGroupAttributeNameSearch": "cn",
"ldapGroupAttributeNameUser": "cn",
"ldapGroupObjectClass": "group",
%else
"ldapBase": "%%ldapUserBaseDN",
"ldapExportedVars": {
"cn": "cn",
@ -195,7 +182,6 @@
"ldapGroupAttributeNameSearch": "cn",
"ldapGroupAttributeNameUser": "uid",
"ldapGroupObjectClass": "eolegroupe",
%end if
"ldapGroupRecursive": 0,
"ldapPasswordResetAttribute": "pwdReset",
"ldapPasswordResetAttributeValue": "TRUE",
@ -247,11 +233,7 @@
%end if
%end if
"maintenance": 0,
%if %%eole_module == "scribe"
"managerDn": "cn=%%ldapBindUserDN,cn=Users,dc=%echo ",dc=".join(%%ad_domain.split('.')) + '",'
%else
"managerDn": "%%ldapBindUserDN",
%end if
%if %%is_file(%%ldapBindUserPassword)
"managerPassword": "%%readPass("", %%ldapBindUserPassword)",
%else