Merge branch 'master' into dist/eole/2.6.2/master
This commit is contained in:
commit
4b26fc5c38
|
@ -5,6 +5,7 @@
|
||||||
<file filelist='lemon' name='/etc/nginx/sites-available/manager-nginx.conf' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/etc/nginx/sites-available/manager-nginx.conf' mkdir='True' rm='True'/>
|
||||||
<file filelist='lemon' name='/etc/nginx/sites-available/handler-nginx.conf' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/etc/nginx/sites-available/handler-nginx.conf' mkdir='True' rm='True'/>
|
||||||
<file filelist='lemon' name='/etc/nginx/sites-available/portal-nginx.conf' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/etc/nginx/sites-available/portal-nginx.conf' mkdir='True' rm='True'/>
|
||||||
|
<file filelist='lemon' name='/etc/nginx/sites-available/test-nginx.conf' mkdir='True' rm='True'/>
|
||||||
<file filelist='lemon' name='/var/lib/lemonldap-ng/conf/lmConf-1.js' mkdir='True' rm='True'/>
|
<file filelist='lemon' name='/var/lib/lemonldap-ng/conf/lmConf-1.js' mkdir='True' rm='True'/>
|
||||||
<service_access service='nginx'>
|
<service_access service='nginx'>
|
||||||
<port service_accesslist="saLemon">80</port>
|
<port service_accesslist="saLemon">80</port>
|
||||||
|
|
|
@ -4,6 +4,7 @@ ENABLE=$(CreoleGet activerLemon 'non')
|
||||||
CONF_FILES="manager-nginx.conf"
|
CONF_FILES="manager-nginx.conf"
|
||||||
CONF_FILES="${CONF_FILES} handler-nginx.conf"
|
CONF_FILES="${CONF_FILES} handler-nginx.conf"
|
||||||
CONF_FILES="${CONF_FILES} portal-nginx.conf"
|
CONF_FILES="${CONF_FILES} portal-nginx.conf"
|
||||||
|
CONF_FILES="${CONF_FILES} test-nginx.conf"
|
||||||
|
|
||||||
for CONF_FILE in ${CONF_FILES}
|
for CONF_FILE in ${CONF_FILES}
|
||||||
do
|
do
|
||||||
|
|
Loading…
Reference in New Issue