Commit b82953ec authored by Xavier Guimard's avatar Xavier Guimard

Update PSGISERVERSOCKET path

parent ab1dcbc3
...@@ -128,7 +128,7 @@ PORT=80 ...@@ -128,7 +128,7 @@ PORT=80
VHOSTLISTEN="*:$(PORT)" VHOSTLISTEN="*:$(PORT)"
TESTWEBSERVER=apache TESTWEBSERVER=apache
TESTWEBSERVERPORT=19876 TESTWEBSERVERPORT=19876
PSGISERVERSOCKET=unix:/run/llng.sock PSGISERVERSOCKET=unix:$(FASTCGISOCKDIR)/llng-fastcgi.sock
# Other # Other
SRCCOMMONDIR=lemonldap-ng-common SRCCOMMONDIR=lemonldap-ng-common
...@@ -326,7 +326,7 @@ prepare_test_server: ...@@ -326,7 +326,7 @@ prepare_test_server:
DEFDOCDIR=`pwd`/doc \ DEFDOCDIR=`pwd`/doc \
FRDOCDIR=`pwd`/po-doc/fr 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/ @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/lemonldap-ng.ini \
e2e-tests/conf/lmConf-1.js \ e2e-tests/conf/lmConf-1.js \
e2e-tests/conf/env.conf \ e2e-tests/conf/env.conf \
......
...@@ -53,7 +53,7 @@ server { ...@@ -53,7 +53,7 @@ server {
# deny all; # deny all;
# include /etc/nginx/fastcgi_params; # include /etc/nginx/fastcgi_params;
# fastcgi_pass __PSGISERVERSOCKET__; # fastcgi_pass __PSGISERVERSOCKET__;
# fastcgi_pass unix:__pwd__/e2e-tests/conf/llng.sock; # fastcgi_pass unix:__FASTCGISOCKDIR__/llng-fastcgi.sock;
# fastcgi_param LLTYPE status; # fastcgi_param LLTYPE status;
#} #}
} }
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