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

Override previous fill on eolesso_adresse
Ref: #30852
2020-10-14 15:55:00 +02:00 · 2020-10-14 15:54:41 +02:00 · 2020-10-14 15:47:17 +02:00 · 2020-10-14 15:46:39 +02:00
1 changed files with 11 additions and 1 deletions
--- a/dicos/71_lemonldap_ng_scribe.xml
+++ b/dicos/71_lemonldap_ng_scribe.xml
@ -3,7 +3,13 @@

    <files />

-    <variables />
+    <variables>
+
+        <family name='eole sso'>
+            <variable name='eolesso_adresse' description="Nom de domaine du serveur d'authentification SSO" redefine="True" />
+        </family>
+
+    </variables>

    <constraints>

@ -26,6 +32,10 @@
            <param name='default_mismatch'>ldap</param>
        </auto>

+        <auto name='calc_val' target='eolesso_adresse'>
+            <param type='eole'>authWebName</param>
+        </auto>
+
        <auto name='calc_val' target='ldapServer'>
            <param type='eole'>adresse_ip_ldap</param>
        </auto>
Author	SHA1	Message	Date
Daniel Dehennin	6890500d5b	Merge branch 'master' into dist/eole/2.8.0/master	2020-10-14 15:55:00 +02:00
Daniel Dehennin	90411f89f7	Override previous fill on eolesso_adresse Ref: #30852	2020-10-14 15:54:41 +02:00
Daniel Dehennin	2355b20c7d	Merge branch 'master' into dist/eole/2.8.0/master	2020-10-14 15:47:17 +02:00
Daniel Dehennin	d99ac8c9ad	Force local SSO on Scribe Ref: #30852	2020-10-14 15:46:39 +02:00