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

Nginx in progress...

Browse Source
This commit is contained in:
Xavier Guimard 2016-01-29 11:09:56 +00:00
parent 40366bfed2
commit 252ef99a6b
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -336,7 +336,8 @@ start_web_server: all prepare_test_server
reload_web_server: reload_web_server:
@if [ -e e2e-tests/conf/apache2.pid ]; then \ @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 \ elif [ -e e2e-tests/conf/nginx.pid ]; then \
kill -HUP `cat e2e-tests/conf/nginx.pid`; \ kill -HUP `cat e2e-tests/conf/nginx.pid`; \
kill `cat e2e-tests/conf/plackup.pid` || true; \ kill `cat e2e-tests/conf/plackup.pid` || true; \
@ -362,7 +363,8 @@ stop_web_server:
restart_web_server: start_web_server restart_web_server: start_web_server
plackup: 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 \ --pidfile e2e-tests/conf/plackup.pid \
-d `pwd` -b -m \ -d `pwd` -b -m \
--exec /usr/bin/plackup -- \ --exec /usr/bin/plackup -- \

4
_example/etc/handler-nginx.conf
View File

@ -3,6 +3,7 @@ server {
server_name test1.example.com; server_name test1.example.com;
root /var/www/html; root /var/www/html;
# Internal authentication request # Internal authentication request
location = /lmauth { location = /lmauth {
internal; internal;
@ -24,7 +25,8 @@ server {
# Client requests # Client requests
location / { location / {
auth_request /lmauth; 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; try_files $uri $uri/ =404;
# Add as many 3-lines block as headers returned by configuration for this # Add as many 3-lines block as headers returned by configuration for this