Fix reset password bug

Fix disable if in
Disable service
2020-11-24 11:08:33 +01:00 · 2020-11-24 10:53:58 +01:00 · 2020-11-24 09:31:12 +01:00 · 2020-11-24 09:30:08 +01:00 · 2020-11-20 14:44:51 +01:00 · 2020-11-20 14:34:56 +01:00
6 changed files with 20 additions and 11 deletions
--- a/4
+++ b/4
@ -4,8 +4,8 @@

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

--- a/README.md
+++ b/README.md
@ -10,14 +10,14 @@ LemonLDAP::NG EOLE integration

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

-#### LemonLDAP::NG repository
+#### LemonLDAP::NG repository (if you use EOLE 2.7.2 this is not needed anymore)
 
 * deb     https://lemonldap-ng.org/deb 1.9 main
 * deb-src https://lemonldap-ng.org/deb 1.9 main
 * Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2 

 #### Cadoles Repository
-* deb [ arch=all  ] https://vulcain.cadoles.com 2.6.2-dev main
+* deb [ arch=all  ] https://vulcain.cadoles.com 2.7.2-dev main
 * Key URL : https://vulcain.cadoles.com/cadoles.gpg

 ### Install packages
--- a/dicos/70_lemonldap_ng.xml
+++ b/dicos/70_lemonldap_ng.xml
@ -12,7 +12,7 @@
 		<file filelist='lemonCAS' name='/usr/share/php/configCAS/cas.inc.php' source='cas.inc.php.tmpl' mkdir='True'/>
 		<file filelist='lemonCAS' name='/usr/share/php/CAS/eoleCASConfig.php' source='eoleCASConfig.php.tmpl' mkdir='True'/>
 		<file filelist='lemonCAS' name='/etc/pam_cas.conf' source="pam_cas_auth.conf"/>
-		<service>lemonldap-ng-fastcgi-server</service>
+		<service servicelist="sllemon">lemonldap-ng-fastcgi-server</service>
 		<service_access service='nginx'>
 			<port service_accesslist="saLemon">80</port>
 			<port service_accesslist="saLemon">443</port>
@ -54,7 +54,7 @@
 				<value>oui</value>
 			</variable>
 			<variable name='ssoCALocation' type='string' description="Chemin de l'autorité de certification (ou rien)" mode="expert"/>
-			<variable name='ssoDebug' type='string' description="Activer le Debug pour la lib php-CAS" mode="expert">
+			<variable name='ssoDebug' type='oui/non' description="Activer le Debug pour la lib php-CAS" mode="expert">
 				<value>non</value>
 			</variable>
 			<variable name='llSkin' type='string' description="Skin utilisé par LemonLDAP::NG">
@ -112,6 +112,7 @@
 			<target type='filelist'>lemon</target>
 			<target type='filelist'>lemonCAS</target>
 			<target type='family'>LemonLDAP</target>
+			<target type='servicelist'>sllemon</target>
 			<target type='service_accesslist'>saLemon</target>
 		</condition>
 		<condition name='disabled_if_in' source='llRegisterAccount'>
@ -135,7 +136,8 @@
 		<variable name='activerLemon'>Activer l'hébergement d'une place de marché HTTP pour OpenNebula</variable>
 		<variable name='managerWebName'>Nom DNS de l'application de gestion de LemonLDAP::NG ex:manager.cadoles.com</variable>
 		<variable name='authWebName'>Nom DNS de service d'authentification de LemonLDAP::NG ex:auth.cadoles.com</variable>
-		<variable name='ldapUserBaseDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</variable>
+		<variable name='ldapUserBaseDN'>DN de base de l'emplactement des utilisateurs dans l'annuaire (ex: ou=users,o=gouv,c=fr)</variable>
+		<variable name='ldapBindUserDN'>DN de l'utilisateur de connection en lecture à l'annuaire (ex: cn=reader,o=gouv,c=fr)</variable>
 		<variable name='nginxBucketSize'>server_names_hash_bucket_size Taille du hash des noms de serveur pour NGINX</variable>
 		<variable name='llCheckLogins'>Affiche une case à cocher sur la mire SSO qui permet a l'utilisateur de voir l'historique de connection de son compte avant d'être redirigé vers le service demandé</variable>
 		<variable name='llCSPTargets'>Liste des domaines à ajouter à la directive form-action.</variable>
--- a/postservice/99-lemonldap-ng
+++ b/postservice/99-lemonldap-ng
@ -1,5 +1,8 @@
 #!/bin/bash

+
+[[ $(CreoleGet activerLemon non) == "non" ]] && exit 0
+
 # Updating Configuration cache

 cmd="/usr/share/lemonldap-ng/bin/lemonldap-ng-cli update-cache"
--- a/tmpl/lmConf-1.js
+++ b/tmpl/lmConf-1.js
@ -392,10 +392,12 @@
    "oidcOPMetaDataJWKS": null,
    "webIDAuthnLevel": 1,
    "issuerDBOpenIDActivation": "1",
-%if %%is_empty(%%llResetUrl)    
+%if %%llResetPassword == "oui"
+  %if %%is_empty(%%llResetUrl)    
    "mailUrl": "https://%%authWebName/mail.pl",
-%else
+  %else
    "mailUrl": "%%llResetUrl",
+  %end if
 %end if
    "maintenance": 0,
    "jsRedirect": 0,
--- a/tmpl/lmConf-1.json
+++ b/tmpl/lmConf-1.json
@ -392,10 +392,12 @@
    "oidcOPMetaDataJWKS": null,
    "webIDAuthnLevel": 1,
    "issuerDBOpenIDActivation": "1",
-%if %%is_empty(%%llResetUrl)    
+%if %%llResetPassword == "oui"
+  %if %%is_empty(%%llResetUrl)    
    "mailUrl": "https://%%authWebName/mail.pl",
-%else
+  %else
    "mailUrl": "%%llResetUrl",
+  %end if
 %end if
    "maintenance": 0,
    "jsRedirect": 0,
Author	SHA1	Message	Date
Philippe Caseiro	fd4ee5dc87	Fix reset password bug	2020-11-24 11:08:33 +01:00
Philippe Caseiro	70a1c26d53	Fix disable if in	2020-11-24 10:53:58 +01:00
Philippe Caseiro	09fcd2eacb	Disable service	2020-11-24 09:31:12 +01:00
Philippe Caseiro	6bf3f75087	Don't run postservice if service is disabled	2020-11-24 09:30:08 +01:00
Philippe Caseiro	beb6341981	Fix llResetUrl bugé	2020-11-20 14:44:51 +01:00
Philippe Caseiro	eafbc3bd8a	Fix typo	2020-11-20 14:34:56 +01:00
Philippe Caseiro	7e3f6d3408	Updating readme	2020-11-20 11:16:29 +01:00
Philippe Caseiro	edc22cacc2	Fix help and variable type	2020-11-20 11:06:51 +01:00
vfebvre	eb06eaaf5a	Merge branch 'develop' into staging	2020-09-10 15:05:11 +02:00
vfebvre	ad9059bfae	passage en 2.7.2	2020-09-03 16:44:25 +02:00