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

dicos/70_lemonldap_ng.xml

@@ -2,14 +2,6 @@
 <creole>
 
     <files>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-<<<<<<< HEAD
-
->>>>>>> master
-=======
->>>>>>> master
         <file filelist='lemonldap' name='/etc/lemonldap-ng/lemonldap-ng.ini' mkdir='True' rm='True'/>
         <file filelist='lemonldap' name='/var/lib/lemonldap-ng/conf/lmConf-1.json' mkdir='True' rm='True'/>
         <file filelist='lemonldap' name='/etc/default/lemonldap-ng-fastcgi-server' mkdir='True' rm='True'/>
@@ -92,6 +84,9 @@
             <variable name='llRegisterAccount' type='oui/non' description="Permettre aux utilisateurs de créer un compte">
                 <value>oui</value>
             </variable>
+            <variable name='lmldapverify' type='oui/non' description="Vérifier les certificats SSL du serveur LDAP">
+                <value>oui</value>
+            </variable>
             <variable name='llRegisterDB' type='string' description="Base de comptes pour l'enregistrement"/>
             <variable name='llRegisterURL' type='string' description="Adresse de l'application de création de compte"/>
             <variable name='llCSPTargets' type='domain' description="Domaines vers lesquels le forumaire peut renvoyer" multi='True'/>
@@ -130,7 +125,7 @@
         </check>
 
         <check name='valid_enum' target="lm_loglevel">
-            <param>['info','notice','warn','error','debug'</param>
+            <param>['info','notice','warn','error','debug']</param>
         </check>
 
         <check name="valid_enum" target="llRegisterDB">

dicos/71_lemonldap_ng_scribe.xml

@@ -7,7 +7,6 @@
 
     <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>
@@ -16,6 +15,10 @@
         </variable>
     </family>
 
+    <family name='annuaire'>
+        <variable name='ldap_tls' description="Utiliser SSL ou TLS" redefine="True" exists='True' />
+    </family>
+
     </variables>
 
     <constraints>

tmpl/lmConf-1.json

@@ -173,6 +173,13 @@
     "ldapPpolicyControl": 0,
     "ldapPwdEnc": "utf-8",
     "ldapServer": "%%ldapScheme://%%ldapServer",
+%if %%ldapScheme == "ldaps"
+   %if %%lmldapverify == "oui"
+    "ldapVerify": "required",
+   %else
+    "ldapVerify": "none",
+   %end if
+%end if
     "ldapSetPassword": 0,
     "ldapTimeout": 120,
     "ldapUsePasswordResetAttribute": 1,