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

Fix .mk file name
2021-03-04 08:44:15 +01:00 · 2021-03-04 08:44:01 +01:00 · 2021-03-03 17:06:40 +01:00 · 2021-03-03 17:05:39 +01:00 · 2021-03-03 17:05:07 +01:00 · 2021-03-03 16:34:26 +01:00
5 changed files with 5 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -10,7 +10,7 @@ LemonLDAP::NG EOLE integration

 GenConfig -> Mode Expert -> Dépôts tiers -> Libellé du dépôt

-#### LemonLDAP::NG repository (if you use EOLE 2.8.X this is not needed anymore)
+#### LemonLDAP::NG repository (if you use EOLE 2.7.2 this is not needed anymore)
 
 * deb     https://lemonldap-ng.org/deb stable main
 * deb-src https://lemonldap-ng.org/deb stable main
--- a/dicos/70_lemonldap_ng.xml
+++ b/dicos/70_lemonldap_ng.xml
@ -160,6 +160,7 @@
        <check name="valid_enum" target="llRegisterDB">
            <param>['LDAP','AD','Demo','Custom']</param>
        </check>
+
        <group master="casAttribute">
            <slave>casLDAPAttribute</slave>
        </group>
--- a/dicos/71_lemonldap_ng_scribe.xml
+++ b/dicos/71_lemonldap_ng_scribe.xml
@ -77,4 +77,4 @@

    <help />

-</creole>
+</creole>
--- a/eole-lemonldap-ng.mk
+++ b/eole-lemonldap-ng.mk
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@ -196,9 +196,9 @@
    "ldapServer": "%%ldapScheme://%%ldapServer",
 %if %%ldapScheme == "ldaps"
   %if %%lmldapverify == "oui"
-    "ldapVerify": "required",
+    "ldapVerify": "Require",
   %else
-    "ldapVerify": "none",
+    "ldapVerify": "None",
   %end if
 %end if
    "ldapSetPassword": 0,
Author	SHA1	Message	Date
Philippe Caseiro	b014a4dd9a	Merge branch '2.7.2/master' into dist/eole/2.7.2/master	2021-03-04 08:44:15 +01:00
Philippe Caseiro	797ec9dc06	Fix .mk file name	2021-03-04 08:44:01 +01:00
Philippe Caseiro	0fa0eab831	Merge branch '2.7.2/master' into dist/eole/2.7.2/master	2021-03-03 17:06:40 +01:00
Philippe Caseiro	e50f17ee3e	Revert "No usr/share/eole in this project" This reverts commit `f1a6fbfdfd`.	2021-03-03 17:05:39 +01:00
Philippe Caseiro	da3c97d534	Merge branch 'master' into 2.7.2/master	2021-03-03 17:05:07 +01:00
Philippe Caseiro	f1a6fbfdfd	No usr/share/eole in this project	2021-03-03 16:34:26 +01:00
Philippe Caseiro	16bdcef9c9	Merge branch 'master' into dist/eole/2.7.2/master	2021-03-03 16:24:30 +01:00
Philippe Caseiro	3edf7dd774	Fix ldapVerify values	2021-03-03 16:24:20 +01:00