Merge branch 'master' into dist/eole/2.7.2/master

This commit is contained in:
Philippe Caseiro 2020-11-26 16:58:39 +01:00
commit 25c5bf5768
1 changed files with 13 additions and 10 deletions

View File

@ -7,7 +7,6 @@
<family name='eole sso'> <family name='eole sso'>
<variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" exists='True' /> <variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" exists='True' />
<variable name='ldap_tls' redefine="True" exists='True' />
<variable name='eolesso_cas_folder' redefine="True" exists='True'> <variable name='eolesso_cas_folder' redefine="True" exists='True'>
<value>cas</value> <value>cas</value>
</variable> </variable>
@ -16,6 +15,10 @@
</variable> </variable>
</family> </family>
<family name='annuaire'>
<variable name='ldap_tls' description="Utiliser SSL ou TLS" redefine="True" exists='True' />
</family>
</variables> </variables>
<constraints> <constraints>