Fix Register button display

Mise à jour de 'README.md'
Merge remote-tracking branch 'eole/master' into develop
2021-01-29 10:10:15 +01:00 · 2021-01-06 11:23:29 +01:00 · 2020-12-18 16:53:36 +01:00 · 2020-12-16 10:31:04 +01:00 · 2020-12-16 10:30:33 +01:00 · 2020-09-03 16:44:25 +02:00
4 changed files with 17 additions and 17 deletions
--- a/6
+++ b/6
@ -3,9 +3,9 @@
 ################################

 SOURCE=eole-lemonldap
-VERSION=2.8
-EOLE_VERSION=2.8
-EOLE_RELEASE=2.8.1
+VERSION=0.1
+EOLE_VERSION=2.7
+EOLE_RELEASE=2.7.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>

--- 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.7.2 this is not needed anymore)
+#### LemonLDAP::NG repository (if you use EOLE 2.8.X this is not needed anymore)
 
 * deb     https://lemonldap-ng.org/deb stable main
 * deb-src https://lemonldap-ng.org/deb stable main
--- a/dicos/71_lemonldap_ng_scribe.xml
+++ b/dicos/71_lemonldap_ng_scribe.xml
@ -24,9 +24,6 @@
            <target type='variable'>activer_sso</target>
        </condition>

-        <auto name='calc_val' target='ldapScheme'>
-            <param>ldaps</param>
-        </auto>

        <fill name='calc_val_first_value' target='eolesso_adresse'>
            <param type='eole' optional='True' hidden='False'>authWebName</param>
@ -34,21 +31,24 @@
            <param type='eole'>nom_domaine_machine</param>
        </fill>

-        <auto name='calc_val' target='ldap_port'>
-	        <param>389</param>
-	    </auto>
-
        <condition name='frozen_if_in' source='activerLemon'>
            <param>oui</param>
            <target type='variable'>eolesso_adresse</target>
        </condition>

+        <auto name='calc_multi_condition' target='ldapScheme'>
+            <param>oui</param>
+            <param type='eole' name='condition_1'>ldap_tls</param>
+            <param name='match'>ldaps</param>
+            <param name='default_mismatch'>ldap</param>
+        </auto>
+
        <auto name='calc_val' target='ldapServer'>
-            <param type='eole'>ad_address</param>
+            <param type='eole'>adresse_ip_ldap</param>
        </auto>

        <auto name='calc_val' target='ldapServerPort'>
-            <param type='number'>389</param>
+            <param type='eole'>ldap_port</param>
        </auto>

        <auto name='calc_val' target='lemon_user_db'>
@ -62,11 +62,11 @@
            <param type='eole'>ldap_base_dn</param>
        </auto>
        <auto name='calc_val' target='ldapBindUserDN'>
-            <param type='eole'>sasl_ldap_reader</param>
+            <param type='eole'>ldap_reader</param>
        </auto>

        <auto name='calc_val' target='ldapBindUserPassword'>
-	    <param>/etc/eole/private/sasl-reader.password</param>
+	        <param type='eole'>ldap_reader_passfile</param>
        </auto>

        <auto name='calc_val' target='casFolder'>
@ -77,4 +77,4 @@

    <help />

-</creole>
+</creole>
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@ -279,7 +279,7 @@
    "portalDisplayChangePassword": "$_auth =~ /^(AD|LDAP|DBI|Demo)$/",
    "portalDisplayLoginHistory": 1,
    "portalDisplayLogout": 1,
-    "portalDisplayRegister": 1,
+    "portalDisplayRegister": %%boolean[%%llRegisterAccount],
    "portalDisplayResetPassword": %%boolean[%%llResetPassword],
    "portalForceAuthn": 0,
    "portalForceAuthnInterval": 0,
Author	SHA1	Message	Date
Philippe Caseiro	583e77d7c7	Fix Register button display	2021-01-29 10:10:15 +01:00
pcaseiro	eddc9696c3	Mise à jour de 'README.md'	2021-01-06 11:23:29 +01:00
Philippe Caseiro	cc9a5e20ce	Merge remote-tracking branch 'eole/master' into develop	2020-12-18 16:53:36 +01:00
Matthieu Lamalle	5512f64aab	Merge branch '2.8.0/master'	2020-12-16 10:31:04 +01:00
Matthieu Lamalle	569e0caab8	set correct openldap conf	2020-12-16 10:30:33 +01:00
vfebvre	ad9059bfae	passage en 2.7.2	2020-09-03 16:44:25 +02:00