Commit 252ef99a authored by Xavier Guimard's avatar Xavier Guimard

Nginx in progress...

parent 40366bfe
......@@ -336,7 +336,8 @@ start_web_server: all prepare_test_server
reload_web_server:
@if [ -e e2e-tests/conf/apache2.pid ]; then \
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \
LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
/usr/sbin/apache2 -d `pwd`/e2e-tests -f apache2.conf -k graceful; \
elif [ -e e2e-tests/conf/nginx.pid ]; then \
kill -HUP `cat e2e-tests/conf/nginx.pid`; \
kill `cat e2e-tests/conf/plackup.pid` || true; \
......@@ -362,7 +363,8 @@ stop_web_server:
restart_web_server: start_web_server
plackup:
@/sbin/start-stop-daemon --start \
@LLNG_DEFAULTCONFFILE=`pwd`/e2e-tests/conf/lemonldap-ng.ini \
/sbin/start-stop-daemon --start \
--pidfile e2e-tests/conf/plackup.pid \
-d `pwd` -b -m \
--exec /usr/bin/plackup -- \
......
......@@ -3,6 +3,7 @@ server {
server_name test1.example.com;
root /var/www/html;
# Internal authentication request
location = /lmauth {
internal;
......@@ -24,7 +25,8 @@ server {
# Client requests
location / {
auth_request /lmauth;
error_page 401 $upstream_http_www_authenticate;
auth_request_set $lmlocation $upstream_http_x_location;
error_page 401 $lmlocation;
try_files $uri $uri/ =404;
# Add as many 3-lines block as headers returned by configuration for this
......
Markdown is supported
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