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

This commit is contained in:
Philippe Caseiro 2018-03-08 15:47:47 +01:00
commit e5ada4d3eb
2 changed files with 7 additions and 6 deletions

View File

@ -8,8 +8,9 @@ Intégration LemonLDAP::NG pour EOLE
Gen_config -> Mode Expert -> Dépôts tiers -> Libellé du dépôt
*# LemonLDAP::NG repository
deb https://lemonldap-ng.org/deb stable main
deb-src https://lemonldap-ng.org/deb stable main
Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2
### LemonLDAP::NG repository
* deb https://lemonldap-ng.org/deb stable main
* deb-src https://lemonldap-ng.org/deb stable main
* Key URL : https://lemonldap-ng.org/_media/rpm-gpg-key-ow2

View File

@ -2,8 +2,8 @@
ENABLE=$(CreoleGet activerLemon 'non')
CONF_FILES='manager-nginx.conf'
CONF_FILES='${CONF_FILE} handler-nginx.conf'
CONF_FILES='${CONF_FILE} portal-nginx.conf'
CONF_FILES='${CONF_FILES} handler-nginx.conf'
CONF_FILES='${CONF_FILES} portal-nginx.conf'
for CONF_FILE in ${CONF_FILES}
do