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

dicos/71_lemonldap_ng_scribe.xml

@@ -5,16 +5,19 @@
 
     <variables>
 
-        <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>
+        <variable name='eolesso_port' redefine="True" exists='True'>
-	    <variable name='eolesso_port' redefine="True" exists='True'>
+            <value>443</value>
-		    <value>443</value>
+        </variable>
-	    </variable>
+    </family>
-        </family>
+
+    <family name='annuaire'>
+        <variable name='ldap_tls' description="Utiliser SSL ou TLS" redefine="True" exists='True' />
+    </family>
 
     </variables>