Commit 6be61204 authored by Yadd's avatar Yadd
Browse files

Propage previous changes to e2e

parent 78f8f9db
......@@ -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 \
......
......@@ -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} =
......
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;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment