From 6be612041e621f3eac3616ee96c48ca028185fca Mon Sep 17 00:00:00 2001
From: Xavier Guimard <xavier.guimard@laposte.net>
Date: Tue, 16 Feb 2016 16:00:45 +0000
Subject: [PATCH] Propage previous changes to e2e

---
 Makefile                  | 2 +-
 e2e-tests/llng.psgi       | 2 +-
 e2e-tests/test-nginx.conf | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index afd72a96c..c9832f679 100644
--- a/Makefile
+++ b/Makefile
@@ -391,7 +391,7 @@ restart_web_server: start_web_server
 plackup:
 	@LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
 	plackup -s FCGI \
-		--listen e2e-tests/conf/llng.sock \
+		--listen e2e-tests/conf/llng-fastcgi.sock \
 		--pid e2e-tests/conf/plackup.pid \
 		--nproc 1 --proc-title llng-fastcgi-server \
 		--no-default-middleware \
diff --git a/e2e-tests/llng.psgi b/e2e-tests/llng.psgi
index 6837839ec..f119c8e1c 100644
--- a/e2e-tests/llng.psgi
+++ b/e2e-tests/llng.psgi
@@ -34,7 +34,7 @@ my %builder = (
         require CGI::Emulate::PSGI;
         require CGI::Compile;
         return sub {
-            my $script = $_[0]->{SCRIPT_NAME};
+            my $script = $_[0]->{SCRIPT_FILENAME};
             return $_apps{$script}->(@_) if ( $_apps{$script} );
             eval {
                 $_apps{$script} =
diff --git a/e2e-tests/test-nginx.conf b/e2e-tests/test-nginx.conf
index 849f5f8f2..900db24ea 100644
--- a/e2e-tests/test-nginx.conf
+++ b/e2e-tests/test-nginx.conf
@@ -1,13 +1,13 @@
 server {
   listen __port__;
-  server_name test1.example.com;
+  server_name test1.example.com test2.example.com;
   root __pwd__/e2e-tests/conf/site;
 
   # Internal authentication request
   location = /lmauth {
     internal;
     include /etc/nginx/fastcgi_params;
-    fastcgi_pass unix:__pwd__/e2e-tests/conf/llng.sock;
+    fastcgi_pass unix:__pwd__/e2e-tests/conf/llng-fastcgi.sock;
 
     # Drop post datas
     fastcgi_pass_request_body  off;
@@ -28,7 +28,7 @@ server {
     error_page 401 $lmlocation;
 
     include /etc/nginx/fastcgi_params;
-    fastcgi_pass unix:__pwd__/e2e-tests/conf/llng.sock;
+    fastcgi_pass unix:__pwd__/e2e-tests/conf/llng-fastcgi.sock;
     fastcgi_param LLTYPE test;
 
     include conf/nginx-lua-headers.conf;
@@ -36,7 +36,7 @@ server {
 
   location = /lmstatus {
     include /etc/nginx/fastcgi_params;
-    fastcgi_pass unix:__pwd__/e2e-tests/conf/llng.sock;
+    fastcgi_pass unix:__pwd__/e2e-tests/conf/llng-fastcgi.sock;
   }
 
 }