Enable lm_combined format (#583)
This commit is contained in:
parent
d08b0285c0
commit
24cda967d4
4
Makefile
4
Makefile
|
@ -338,7 +338,8 @@ e2e_test: all prepare_test_server start_web_server launch_protractor stop_web_se
|
|||
|
||||
prepare_test_server:
|
||||
@mkdir -p e2e-tests/conf/sessions/lock e2e-tests/conf/persistents/lock
|
||||
@$(MAKE) install_webserver_conf install_test_site install_fastcgi_server \
|
||||
$(MAKE) install_webserver_conf install_test_site install_fastcgi_server \
|
||||
CONFDIR=`pwd`/e2e-tests/conf \
|
||||
RCONFDIR=e2e-tests/conf \
|
||||
ERASECONFIG=1 \
|
||||
VHOSTLISTEN='*:$(TESTWEBSERVERPORT)' \
|
||||
|
@ -564,6 +565,7 @@ install_webserver_conf:
|
|||
s#__MANAGERPSGIDIR__#$(MANAGERPSGIDIR)/#g; \
|
||||
s#__TESTDIR__#$(TESTDIR)/#g; \
|
||||
s#__PORT__#$(PORT)#g; \
|
||||
s#__CONFDIR__#$(CONFDIR)#g; \
|
||||
s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g; \
|
||||
s#__VHOSTLISTEN__#$(VHOSTLISTEN)#g; \
|
||||
s#__DEFDOCDIR__#$(DEFDOCDIR)/#g; \
|
||||
|
|
|
@ -12,6 +12,10 @@
|
|||
# IMPORTANT:
|
||||
# To protect applications, see test-nginx.conf template in example files
|
||||
|
||||
# Log format
|
||||
include __CONFDIR__/nginx-lmlog.conf;
|
||||
access_log conf/nginx.log lm_combined;
|
||||
|
||||
server {
|
||||
listen __PORT__;
|
||||
server_name reload.__DNSDOMAIN__;
|
||||
|
|
|
@ -41,7 +41,7 @@ server {
|
|||
##################################
|
||||
|
||||
# IF LUA IS SUPPORTED
|
||||
#include /etc/lemonldap-ng/nginx-lua-headers.conf;
|
||||
#include __CONFDIR__/nginx-lua-headers.conf;
|
||||
|
||||
# ELSE
|
||||
# Set manually your headers
|
||||
|
|
|
@ -15,8 +15,6 @@ http {
|
|||
types_hash_max_size 2048;
|
||||
include /etc/nginx/mime.types;
|
||||
default_type application/octet-stream;
|
||||
include conf/nginx-lmlog.conf;
|
||||
access_log conf/nginx.log lm_combined;
|
||||
error_log conf/nginx.log info;
|
||||
gzip off;
|
||||
include conf/*nginx.conf;
|
||||
|
|
Loading…
Reference in New Issue