Propage previous changes to e2e
This commit is contained in:
parent
78f8f9dbb0
commit
6be612041e
2
Makefile
2
Makefile
|
@ -391,7 +391,7 @@ restart_web_server: start_web_server
|
||||||
plackup:
|
plackup:
|
||||||
@LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
|
@LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
|
||||||
plackup -s FCGI \
|
plackup -s FCGI \
|
||||||
--listen e2e-tests/conf/llng.sock \
|
--listen e2e-tests/conf/llng-fastcgi.sock \
|
||||||
--pid e2e-tests/conf/plackup.pid \
|
--pid e2e-tests/conf/plackup.pid \
|
||||||
--nproc 1 --proc-title llng-fastcgi-server \
|
--nproc 1 --proc-title llng-fastcgi-server \
|
||||||
--no-default-middleware \
|
--no-default-middleware \
|
||||||
|
|
|
@ -34,7 +34,7 @@ my %builder = (
|
||||||
require CGI::Emulate::PSGI;
|
require CGI::Emulate::PSGI;
|
||||||
require CGI::Compile;
|
require CGI::Compile;
|
||||||
return sub {
|
return sub {
|
||||||
my $script = $_[0]->{SCRIPT_NAME};
|
my $script = $_[0]->{SCRIPT_FILENAME};
|
||||||
return $_apps{$script}->(@_) if ( $_apps{$script} );
|
return $_apps{$script}->(@_) if ( $_apps{$script} );
|
||||||
eval {
|
eval {
|
||||||
$_apps{$script} =
|
$_apps{$script} =
|
||||||
|
|
|
@ -1,13 +1,13 @@
|
||||||
server {
|
server {
|
||||||
listen __port__;
|
listen __port__;
|
||||||
server_name test1.example.com;
|
server_name test1.example.com test2.example.com;
|
||||||
root __pwd__/e2e-tests/conf/site;
|
root __pwd__/e2e-tests/conf/site;
|
||||||
|
|
||||||
# Internal authentication request
|
# Internal authentication request
|
||||||
location = /lmauth {
|
location = /lmauth {
|
||||||
internal;
|
internal;
|
||||||
include /etc/nginx/fastcgi_params;
|
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
|
# Drop post datas
|
||||||
fastcgi_pass_request_body off;
|
fastcgi_pass_request_body off;
|
||||||
|
@ -28,7 +28,7 @@ server {
|
||||||
error_page 401 $lmlocation;
|
error_page 401 $lmlocation;
|
||||||
|
|
||||||
include /etc/nginx/fastcgi_params;
|
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;
|
fastcgi_param LLTYPE test;
|
||||||
|
|
||||||
include conf/nginx-lua-headers.conf;
|
include conf/nginx-lua-headers.conf;
|
||||||
|
@ -36,7 +36,7 @@ server {
|
||||||
|
|
||||||
location = /lmstatus {
|
location = /lmstatus {
|
||||||
include /etc/nginx/fastcgi_params;
|
include /etc/nginx/fastcgi_params;
|
||||||
fastcgi_pass unix:__pwd__/e2e-tests/conf/llng.sock;
|
fastcgi_pass unix:__pwd__/e2e-tests/conf/llng-fastcgi.sock;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user