From 24cda967d43d4b92dbaa26ce40f2bcd02d17812a Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Wed, 24 Feb 2016 06:54:18 +0000
Subject: [PATCH] Enable lm_combined format (#583)

---
 Makefile                        | 4 +++-
 _example/etc/handler-nginx.conf | 4 ++++
 _example/etc/test-nginx.conf    | 2 +-
 e2e-tests/nginx.conf            | 2 --
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 749a796f7..2f360e1e8 100644
--- a/Makefile
+++ b/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; \
diff --git a/_example/etc/handler-nginx.conf b/_example/etc/handler-nginx.conf
index 971857fd1..bc869b9b1 100644
--- a/_example/etc/handler-nginx.conf
+++ b/_example/etc/handler-nginx.conf
@@ -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__;
diff --git a/_example/etc/test-nginx.conf b/_example/etc/test-nginx.conf
index 2a5631f57..a4507fe99 100644
--- a/_example/etc/test-nginx.conf
+++ b/_example/etc/test-nginx.conf
@@ -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
diff --git a/e2e-tests/nginx.conf b/e2e-tests/nginx.conf
index 96287239c..00b7fcbf9 100644
--- a/e2e-tests/nginx.conf
+++ b/e2e-tests/nginx.conf
@@ -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;