diff --git a/dicos/70_lemonldap_ng.xml b/dicos/70_lemonldap_ng.xml index 49e614d..e648467 100644 --- a/dicos/70_lemonldap_ng.xml +++ b/dicos/70_lemonldap_ng.xml @@ -164,7 +164,7 @@ casLDAPAttribute - + AD llADPasswordMaxAge llADPasswordExpireWarn diff --git a/dicos/71_lemonldap_ng_scribe.xml b/dicos/71_lemonldap_ng_scribe.xml index 691bd0c..98d68d9 100644 --- a/dicos/71_lemonldap_ng_scribe.xml +++ b/dicos/71_lemonldap_ng_scribe.xml @@ -24,9 +24,6 @@ activer_sso - - ldaps - authWebName @@ -34,37 +31,42 @@ nom_domaine_machine - - 636 - - oui eolesso_adresse + + oui + ldap_tls + ldaps + ldap + + - ad_address + adresse_ip_ldap - 636 + ldap_port - AD + LDAP - AD + LDAP + + + ldap_base_dn - - sasl_ldap_reader + ldap_reader - /etc/eole/private/sasl-reader.password + ldap_reader_passfile @@ -75,4 +77,4 @@ - + \ No newline at end of file diff --git a/tmpl/lmConf-1.json b/tmpl/lmConf-1.json index c184969..19e1333 100644 --- a/tmpl/lmConf-1.json +++ b/tmpl/lmConf-1.json @@ -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", @@ -254,11 +240,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