Reorganized certs

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
+    - ./certs:/etc/nginx/certs:ro

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
+    - ./certs:/etc/nginx/certs:ro

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
-

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