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

eolesso_adresse should be forced only when LemonLDAP::NG is enabled
The “calc_val” was failing when LemonLDAP::NG was disabled because “authWebName” can't be used. We shouldn't force “eolesso_adresse” when LemonLDAP::NG is disabled, the user must be able to set whatever value she wants. * dicos/71_lemonldap_ng_scribe.xml: fill the “eolesso_adresse” and freeze it when LemonLDAP::NG is enabled. Ref: #30852
2020-10-15 09:10:44 +02:00 · 2020-10-15 09:07:40 +02:00 · 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
4 changed files with 21 additions and 3 deletions
--- a/debian/control
+++ b/debian/control
@ -20,6 +20,7 @@ Package: eole-lemonldap-ng-scribe
 Architecture: all
 Depends: eole-scribe,
         eole-lemonldap-ng,
+	 libapache2-mod-perl2,
         ${misc:Depends}
 Description: Dictionnaire pour calculer les valeurs automatiquement sur Scribe
 .
--- a/debian/copyright
+++ b/debian/copyright
@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: eole-common
-Source: http://dev-eole.ac-dijon.fr/projects/eole-common
+Upstream-Name: eole-lemonldap-ng
+Source: http://dev-eole.ac-dijon.fr/projects/sso

 Files: *
 Copyright: 2020 Équipe EOLE <eole@ac-dijon.fr>
--- a/debian/source/.format.un~
+++ b/debian/source/.format.un~
--- 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,17 @@
            <param name='default_mismatch'>ldap</param>
        </auto>

+        <fill name='calc_val_first_value' target='eolesso_adresse'>
+            <param type='eole' optional='True' hidden='False'>authWebName</param>
+            <param type='eole' optional='True' hidden='False'>web_url</param>
+            <param type='eole'>nom_domaine_machine</param>
+        </fill>
+
+        <condition name='frozen_if_in' source='activerLemon'>
+            <param>oui</param>
+            <target type='variable'>eolesso_adresse</target>
+        </condition>
+
        <auto name='calc_val' target='ldapServer'>
            <param type='eole'>adresse_ip_ldap</param>
        </auto>
Author	SHA1	Message	Date
Daniel Dehennin	c7d4949fb7	Merge branch 'master' into dist/eole/2.8.0/master	2020-10-15 09:10:44 +02:00
Daniel Dehennin	9b66227236	eolesso_adresse should be forced only when LemonLDAP::NG is enabled The “calc_val” was failing when LemonLDAP::NG was disabled because “authWebName” can't be used. We shouldn't force “eolesso_adresse” when LemonLDAP::NG is disabled, the user must be able to set whatever value she wants. * dicos/71_lemonldap_ng_scribe.xml: fill the “eolesso_adresse” and freeze it when LemonLDAP::NG is enabled. Ref: #30852	2020-10-15 09:07:40 +02:00
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
Daniel Dehennin	2ac6c9158f	Clean garbage file Ref: #30852	2020-10-14 15:08:57 +02:00
Daniel Dehennin	c9c23aaa69	Copyright on the good project Ref: #30852	2020-10-14 15:08:32 +02:00
Daniel Dehennin	26ddf79a97	Scribe requires the libapache2-mod-perl2 Ref: #30852	2020-10-14 14:36:22 +02:00