dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Propage previous changes to e2e

Browse Source
This commit is contained in:
Xavier Guimard 2016-02-16 16:00:45 +00:00
parent 78f8f9dbb0
commit 6be612041e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -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 \

2
e2e-tests/llng.psgi
View File

@ -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} =

8
e2e-tests/test-nginx.conf
View File

@ -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;
} }
} }