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

dicos/70_lemonldap_ng.xml

@@ -112,6 +112,7 @@
 			<target type='filelist'>lemon</target>
 			<target type='filelist'>lemonCAS</target>
 			<target type='family'>LemonLDAP</target>
+			<target type='service'>lemonldap-ng-fastcgi-server</target>
 			<target type='service_accesslist'>saLemon</target>
 		</condition>
 		<condition name='disabled_if_in' source='llRegisterAccount'>

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"

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,