From 912f5615dcf4bb8073f66453192493e908f18343 Mon Sep 17 00:00:00 2001
From: Steve Kamerman <stevekamerman@gmail.com>
Date: Wed, 1 Feb 2017 07:41:12 +0000
Subject: [PATCH] Reorganized certs

---
 test2/test_ssl/test_nohttp.yml     | 3 +--
 test2/test_ssl/test_noredirect.yml | 3 +--
 test2/test_ssl/test_wildcard.py    | 1 -
 test2/test_ssl/test_wildcard.yml   | 5 +----
 4 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/test2/test_ssl/test_nohttp.yml b/test2/test_ssl/test_nohttp.yml
index b945e4a..8486c5e 100644
--- a/test2/test_ssl/test_nohttp.yml
+++ b/test2/test_ssl/test_nohttp.yml
@@ -12,5 +12,4 @@ sut:
   image: jwilder/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./certs/web2.nginx-proxy.tld.crt:/etc/nginx/certs/web2.nginx-proxy.tld.crt:ro
-    - ./certs/web2.nginx-proxy.tld.key:/etc/nginx/certs/web2.nginx-proxy.tld.key:ro
\ No newline at end of file
+    - ./certs:/etc/nginx/certs:ro
diff --git a/test2/test_ssl/test_noredirect.yml b/test2/test_ssl/test_noredirect.yml
index 5209d72..8d0b4b2 100644
--- a/test2/test_ssl/test_noredirect.yml
+++ b/test2/test_ssl/test_noredirect.yml
@@ -12,5 +12,4 @@ sut:
   image: jwilder/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./certs/web3.nginx-proxy.tld.crt:/etc/nginx/certs/web3.nginx-proxy.tld.crt:ro
-    - ./certs/web3.nginx-proxy.tld.key:/etc/nginx/certs/web3.nginx-proxy.tld.key:ro
\ No newline at end of file
+    - ./certs:/etc/nginx/certs:ro
diff --git a/test2/test_ssl/test_wildcard.py b/test2/test_ssl/test_wildcard.py
index 2bea1d5..9885d94 100644
--- a/test2/test_ssl/test_wildcard.py
+++ b/test2/test_ssl/test_wildcard.py
@@ -21,4 +21,3 @@ def test_web1_HSTS_policy_is_active(docker_compose, nginxproxy, subdomain):
     r = nginxproxy.get("https://%s.nginx-proxy.tld/port" % subdomain, allow_redirects=False)
     assert "answer from port 81\n" in r.text
     assert "Strict-Transport-Security" in r.headers
-
diff --git a/test2/test_ssl/test_wildcard.yml b/test2/test_ssl/test_wildcard.yml
index 3678693..27840d3 100644
--- a/test2/test_ssl/test_wildcard.yml
+++ b/test2/test_ssl/test_wildcard.yml
@@ -5,12 +5,9 @@ web1:
   environment:
     WEB_PORTS: "81"
     VIRTUAL_HOST: "*.nginx-proxy.tld"
-    CERT_NAME: "nginx-proxy.tld"
-
 
 sut:
   image: jwilder/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./certs/nginx-proxy.tld.crt:/etc/nginx/certs/nginx-proxy.tld.crt:ro
-    - ./certs/nginx-proxy.tld.key:/etc/nginx/certs/nginx-proxy.tld.key:ro
+    - ./certs:/etc/nginx/certs:ro