Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
lemonldap-ng
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
258
Issues
258
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LemonLDAP NG
lemonldap-ng
Commits
6c6b582c
Commit
6c6b582c
authored
Jan 29, 2016
by
Yadd
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add plackup start in `make start_web_server TESTWEBSERVER=nginx`
parent
d5b88033
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
Makefile
Makefile
+16
-6
e2e-tests/handler-server.psgi
e2e-tests/handler-server.psgi
+0
-0
No files found.
Makefile
View file @
6c6b582c
...
...
@@ -314,16 +314,25 @@ e2e-tests/conf/apache2.pid: start_web_server
start_web_server
:
all prepare_test_server
# Clean old server if launched
-
@[
-e
e2e-tests/conf/apache2.pid
]
&&
kill
`
cat
e2e-tests/conf/apache2.pid
`
&&
sleep
1
-
@[
-e
e2e-tests/conf/nginx.pid
]
&&
kill
`
cat
e2e-tests/conf/nginx.pid
`
-
@[
-e
e2e-tests/conf/apache2.pid
]
&&
kill
`
cat
e2e-tests/conf/apache2.pid
`
||
true
-
@[
-e
e2e-tests/conf/nginx.pid
]
&&
kill
`
cat
e2e-tests/conf/nginx.pid
`
||
true
-
@[
-e
e2e-tests/conf/plackup.pid
]
&&
kill
`
cat
e2e-tests/conf/plackup.pid
`
&&
rm
-f
e2e-tests/conf/plackup.pid
||
true
# Start web server
(
designed
for
Debian, path may be broken
else
)
@
if
test
"
$(TESTWEBSERVER)
"
=
"apache"
;
then
\
if
test
"
$(TESTWEBSERVER)
"
=
"apache"
;
then
\
LLNG_DEFAULTCONFFILE
=
`
pwd
`
/e2e-tests/conf/lemonldap-ng.ini /usr/sbin/apache2
-d
`
pwd
`
/e2e-tests
-f
apache2.conf
-k
start
;
\
elif
test
"
$(TESTWEBSERVER)
"
=
"nginx"
;
then
\
@
$(NGINX)
-p
`
pwd
`
/e2e-tests
\
echo
"Launching nginx"
;
\
$(NGINX)
-p
`
pwd
`
/e2e-tests
\
-g
'error_log /home/xavier/dev/lemonldap/e2e-tests/conf/nginx.log;'
\
-c
`
pwd
`
/e2e-tests/nginx.conf
\
2>&1 |
grep
-v
'Permission denied'
||
true
;
\
echo
"Launching plackup"
;
\
/sbin/start-stop-daemon
--start
\
--pidfile
e2e-tests/conf/plackup.pid
\
-d
`
pwd
`
-b
-m
\
--exec
/usr/bin/plackup
--
\
-s
FCGI
--listen
e2e-tests/conf/llng.sock
\
e2e-tests/handler-server.psgi
;
\
else
\
echo
"!!!!! Unknown test server:
$(TESTWEBSERVER)
!!!!!"
>
&2
;
\
exit
1
;
\
...
...
@@ -347,8 +356,9 @@ launch_protractor: all e2e-tests/conf/apache2.pid
stop_web_server
:
# Stop web server
-
@[
-e
e2e-tests/conf/apache2.pid
]
&&
kill
`
cat
e2e-tests/conf/apache2.pid
`
-
@[
-e
e2e-tests/conf/nginx.pid
]
&&
kill
`
cat
e2e-tests/conf/nginx.pid
`
-
@[
-e
e2e-tests/conf/apache2.pid
]
&&
kill
`
cat
e2e-tests/conf/apache2.pid
`
||
true
-
@[
-e
e2e-tests/conf/nginx.pid
]
&&
kill
`
cat
e2e-tests/conf/nginx.pid
`
||
true
-
@[
-e
e2e-tests/conf/plackup.pid
]
&&
kill
`
cat
e2e-tests/conf/plackup.pid
`
&&
rm
-f
e2e-tests/conf/plackup.pid
||
true
# Clean
@
rm
-rf
e2e-tests/conf
...
...
e2e-tests/
nginx
.psgi
→
e2e-tests/
handler-server
.psgi
View file @
6c6b582c
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment