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

Cleanup ldap_tls redefine
2020-11-26 16:58:39 +01:00 · 2020-11-26 16:58:32 +01:00
1 changed files with 13 additions and 10 deletions
--- a/dicos/71_lemonldap_ng_scribe.xml
+++ b/dicos/71_lemonldap_ng_scribe.xml
@ -5,16 +5,19 @@

    <variables>

-        <family name='eole sso'>
-            <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'>
-		    <value>cas</value>
-	    </variable>
-	    <variable name='eolesso_port' redefine="True" exists='True'>
-		    <value>443</value>
-	    </variable>
-        </family>
+    <family name='eole sso'>
+        <variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" exists='True' />
+        <variable name='eolesso_cas_folder' redefine="True" exists='True'>
+            <value>cas</value>
+        </variable>
+        <variable name='eolesso_port' redefine="True" exists='True'>
+            <value>443</value>
+        </variable>
+    </family>
+
+    <family name='annuaire'>
+        <variable name='ldap_tls' description="Utiliser SSL ou TLS" redefine="True" exists='True' />
+    </family>

    </variables>
Author	SHA1	Message	Date
Philippe Caseiro	25c5bf5768	Merge branch 'master' into dist/eole/2.7.2/master	2020-11-26 16:58:39 +01:00
Philippe Caseiro	03a00fb7ce	Cleanup ldap_tls redefine	2020-11-26 16:58:32 +01:00