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

Update PSGISERVERSOCKET path

Browse Source
This commit is contained in:
Xavier Guimard 2016-02-15 18:15:43 +00:00
parent ab1dcbc359
commit b82953ec47
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -128,7 +128,7 @@ PORT=80
VHOSTLISTEN="*:$(PORT)"
TESTWEBSERVER=apache
TESTWEBSERVERPORT=19876
PSGISERVERSOCKET=unix:/run/llng.sock
PSGISERVERSOCKET=unix:$(FASTCGISOCKDIR)/llng-fastcgi.sock
# Other
SRCCOMMONDIR=lemonldap-ng-common
@ -326,7 +326,7 @@ prepare_test_server:
DEFDOCDIR=`pwd`/doc \
FRDOCDIR=`pwd`/po-doc/fr
@cp e2e-tests/lmConf-1.js e2e-tests/lemonldap-ng.ini e2e-tests/env.conf e2e-tests/test-nginx.conf e2e-tests/conf/
@perl -i -pe 'BEGIN{$$p=`pwd`;chomp $$p}s#__pwd__#$$p#;s/__port__/$(TESTWEBSERVERPORT)/' \
@perl -i -pe 'BEGIN{$$p=`pwd`;chomp $$p}s#__pwd__#$$p#;s/__port__/$(TESTWEBSERVERPORT)/;s/__FASTCGISOCKDIR__/$(FASTCGISOCKDIR)/;' \
e2e-tests/conf/lemonldap-ng.ini \
e2e-tests/conf/lmConf-1.js \
e2e-tests/conf/env.conf \

2
_example/etc/test-nginx.conf
View File

@ -53,7 +53,7 @@ server {
# deny all;
# include /etc/nginx/fastcgi_params;
# fastcgi_pass __PSGISERVERSOCKET__;
# fastcgi_pass unix:__pwd__/e2e-tests/conf/llng.sock;
# fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
# fastcgi_param LLTYPE status;
#}
}