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

This commit is contained in:
Philippe Caseiro 2020-11-24 10:54:09 +01:00
commit 9a7db5bd01

View File

@ -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>
@ -112,7 +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='servicelist'>sllemon</target>
<target type='service_accesslist'>saLemon</target>
</condition>
<condition name='disabled_if_in' source='llRegisterAccount'>