From 5a15af5abe72c60cca790c5c197e12f6c302ac8c Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 17 Jul 2015 08:30:34 +0000
Subject: [PATCH 1/2] Change integration nginx port to 8081.

Ref https://github.com/letsencrypt/boulder/issues/482.
---
 tests/integration/nginx.conf.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/nginx.conf.sh b/tests/integration/nginx.conf.sh
index 7a05f0519..12610d895 100755
--- a/tests/integration/nginx.conf.sh
+++ b/tests/integration/nginx.conf.sh
@@ -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;
 

From 0d63c94b8ebca947111d07c5b7c5c95ad1d00ef2 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Fri, 17 Jul 2015 08:41:27 +0000
Subject: [PATCH 2/2] Move nginx-boulder integration tests to subpkg dir.

---
 .../tests/boulder-integration.conf.sh                           | 0
 .../nginx.sh => letsencrypt-nginx/tests/boulder-integration.sh  | 2 +-
 tests/boulder-integration.sh                                    | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/integration/nginx.conf.sh => letsencrypt-nginx/tests/boulder-integration.conf.sh (100%)
 rename tests/integration/nginx.sh => letsencrypt-nginx/tests/boulder-integration.sh (88%)

diff --git a/tests/integration/nginx.conf.sh b/letsencrypt-nginx/tests/boulder-integration.conf.sh
similarity index 100%
rename from tests/integration/nginx.conf.sh
rename to letsencrypt-nginx/tests/boulder-integration.conf.sh
diff --git a/tests/integration/nginx.sh b/letsencrypt-nginx/tests/boulder-integration.sh
similarity index 88%
rename from tests/integration/nginx.sh
rename to letsencrypt-nginx/tests/boulder-integration.sh
index 856615ad5..3cbe9f6b9 100755
--- a/tests/integration/nginx.sh
+++ b/letsencrypt-nginx/tests/boulder-integration.sh
@@ -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
diff --git a/tests/boulder-integration.sh b/tests/boulder-integration.sh
index 06a1d8aa9..99829e661 100755
--- a/tests/boulder-integration.sh
+++ b/tests/boulder-integration.sh
@@ -55,5 +55,5 @@ done
 
 if type nginx;
 then
-    . ./tests/integration/nginx.sh
+    . ./letsencrypt-nginx/tests/boulder-integration.sh
 fi