upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-03-23 19:03:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'boulder-debug-server-8080' into gitignore

Browse source
This commit is contained in:
Jakub Warmuz 2015-07-17 08:45:39 +00:00
commit dc9fbfa4bb
No known key found for this signature in database
GPG key ID: 2A7BAD3A489B52EA
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/integration/nginx.conf.sh → letsencrypt-nginx/tests/boulder-integration.conf.sh
View file

@ -48,9 +48,9 @@ http {
server {
# IPv4.
listen 8080;
listen 8081;
# IPv6.
listen [::]:8080 default ipv6only=on;
listen [::]:8081 default ipv6only=on;
root $root/webroot;

2
tests/integration/nginx.sh → letsencrypt-nginx/tests/boulder-integration.sh
View file

@ -6,7 +6,7 @@
export PATH="/usr/sbin:$PATH" # /usr/sbin/nginx
nginx_root="$root/nginx"
mkdir $nginx_root
root="$nginx_root" ./tests/integration/nginx.conf.sh > $nginx_root/nginx.conf
root="$nginx_root" ./letsencrypt-nginx/tests/boulder-integration.conf.sh > $nginx_root/nginx.conf
killall nginx || true
nginx -c $nginx_root/nginx.conf

2
tests/boulder-integration.sh
View file

@ -55,5 +55,5 @@ done
if type nginx;
then
. ./tests/integration/nginx.sh
. ./letsencrypt-nginx/tests/boulder-integration.sh
fi