Join variables
This commit is contained in:
parent
b82953ec47
commit
3f1d4b69bc
5
Makefile
5
Makefile
|
@ -128,7 +128,6 @@ PORT=80
|
|||
VHOSTLISTEN="*:$(PORT)"
|
||||
TESTWEBSERVER=apache
|
||||
TESTWEBSERVERPORT=19876
|
||||
PSGISERVERSOCKET=unix:$(FASTCGISOCKDIR)/llng-fastcgi.sock
|
||||
|
||||
# Other
|
||||
SRCCOMMONDIR=lemonldap-ng-common
|
||||
|
@ -318,7 +317,7 @@ prepare_test_server:
|
|||
ERASECONFIG=1 \
|
||||
VHOSTLISTEN='*:$(TESTWEBSERVERPORT)' \
|
||||
PORT=$(TESTWEBSERVERPORT) \
|
||||
PSGISERVERSOCKET=unix:`pwd`/e2e-tests/conf/llng.sock \
|
||||
FASTCGISOCKDIR=`pwd`/e2e-tests/conf \
|
||||
PORTALDIR=`pwd`/$(SRCPORTALDIR)/example \
|
||||
MANAGERDIR=`pwd`/$(SRCMANAGERDIR)/site \
|
||||
TESTDIR=`pwd`/e2e-tests/conf/site \
|
||||
|
@ -539,7 +538,7 @@ install_webserver_conf:
|
|||
s#__MANAGERPSGIDIR__#$(MANAGERPSGIDIR)/#g; \
|
||||
s#__TESTDIR__#$(TESTDIR)/#g; \
|
||||
s#__PORT__#$(PORT)#g; \
|
||||
s#__PSGISERVERSOCKET__#$(PSGISERVERSOCKET)#g; \
|
||||
s#__FASTCGISOCKDIR__#$(FASTCGISOCKDIR)#g; \
|
||||
s#__VHOSTLISTEN__#$(VHOSTLISTEN)#g; \
|
||||
s#__DEFDOCDIR__#$(DEFDOCDIR)/#g; \
|
||||
s#__FRDOCDIR__#$(FRDOCDIR)/#g;' $(RCONFDIR)/*apache*.conf $(RCONFDIR)/*nginx*.conf
|
||||
|
|
|
@ -21,7 +21,7 @@ server {
|
|||
allow 127.0.0.1;
|
||||
deny all;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_pass __PSGISERVERSOCKET__;
|
||||
fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
}
|
||||
|
||||
# Client requests
|
||||
|
@ -37,7 +37,7 @@ server {
|
|||
# allow 127.0.0.1;
|
||||
# deny all;
|
||||
# include /etc/nginx/fastcgi_params;
|
||||
# fastcgi_pass __PSGISERVERSOCKET__;
|
||||
# fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
# fastcgi_param LLTYPE status;
|
||||
#}
|
||||
}
|
||||
|
|
|
@ -10,7 +10,7 @@ server {
|
|||
|
||||
location /manager.psgi {
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_pass __PSGISERVERSOCKET__;
|
||||
fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
fastcgi_param LLTYPE manager;
|
||||
fastcgi_param SCRIPT_NAME /manager.psgi;
|
||||
}
|
||||
|
|
|
@ -7,7 +7,7 @@ server {
|
|||
|
||||
location ~ \.pl$ {
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_pass __PSGISERVERSOCKET__;
|
||||
fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
fastcgi_param LLTYPE auth;
|
||||
fastcgi_param SCRIPT_NAME $document_root$fastcgi_script_name;
|
||||
fastcgi_split_path_info ^(.*\.pl)(/.+)$;
|
||||
|
|
|
@ -8,7 +8,7 @@ server {
|
|||
location = /lmauth {
|
||||
internal;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_pass __PSGISERVERSOCKET__;
|
||||
fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
|
||||
# Drop post datas
|
||||
fastcgi_pass_request_body off;
|
||||
|
@ -52,7 +52,6 @@ server {
|
|||
# allow 127.0.0.1;
|
||||
# deny all;
|
||||
# include /etc/nginx/fastcgi_params;
|
||||
# fastcgi_pass __PSGISERVERSOCKET__;
|
||||
# fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
# fastcgi_param LLTYPE status;
|
||||
#}
|
||||
|
|
|
@ -112,7 +112,7 @@ Configure Nginx:
|
|||
location = /lmauth {
|
||||
internal;
|
||||
include /etc/nginx/fastcgi_params;
|
||||
fastcgi_pass __PSGISERVERSOCKET__;
|
||||
fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
|
||||
|
||||
# Drop post datas
|
||||
fastcgi_pass_request_body off;
|
||||
|
|
Loading…
Reference in New Issue