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

Disable service
Don't run postservice if service is disabled
2020-11-24 09:32:41 +01:00 · 2020-11-24 09:31:12 +01:00 · 2020-11-24 09:30:08 +01:00
2 changed files with 4 additions and 0 deletions
--- a/dicos/70_lemonldap_ng.xml
+++ b/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'>
--- 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"
Author	SHA1	Message	Date
Philippe Caseiro	c150f446c8	Merge branch 'master' into dist/eole/2.7.2/master	2020-11-24 09:32:41 +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