Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-02-03 10:52:03 +01:00
commit 2bb89b008d

View File

@ -180,7 +180,7 @@ parameters:
ldap_baseniveau01: ou=%%ninegate_niveau01branche,ou=%%ninegate_organization,%%ldap_base_dn
ldap_baseniveau02: ou=%%ninegate_niveau02branche,ou=%%ninegate_organization,%%ldap_base_dn
ldap_basegroup: ou=groups,ou=%%ninegate_organization,%%ldap_base_dn
%else if %%getVar("ninegate_ldaptemplate", 'open') == "open"
%else if %%getVar("ninegate_ldaptemplate", '') == "open"
%if not %%is_empty(%%ninegate_openldapsubbranchuser)
ldap_baseuser: %%ninegate_openldapsubbranchuser
%else