From 092a1ee0fb8385e247ae45f785112a317183eb16 Mon Sep 17 00:00:00 2001
From: Joona Hoikkala <joona@kuori.org>
Date: Sun, 20 Mar 2016 18:37:57 +0200
Subject: [PATCH] Made apache configs a bit more generic for tests

---
 .../apache-conf-files/passing/ipv6-1143.conf  | 12 +++++-----
 .../apache-conf-files/passing/ipv6-1143b.conf | 18 +++++++-------
 .../apache-conf-files/passing/ipv6-1143c.conf | 12 +++++-----
 .../apache-conf-files/passing/ipv6-1143d.conf | 24 ++++++++++++++-----
 4 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143.conf
index ab4ed412e..22b39c9f2 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143.conf
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143.conf
@@ -1,9 +1,9 @@
-<VirtualHost 173.192.30.7:80 [2607:f0d0:1005:99::3:1337]:80>
-DocumentRoot /xxxx/
-ServerName noodles.net.nz
-ServerAlias www.noodles.net.nz
-CustomLog ${APACHE_LOG_DIR}/domlogs/noodles.log combined
-<Directory "/xxxx/">
+<VirtualHost *:80 [::]:80>
+DocumentRoot /var/www/html/
+ServerName example.com
+ServerAlias www.example.com
+CustomLog ${APACHE_LOG_DIR}/example.log combined
+<Directory "/var/www/html/">
   AllowOverride All
 </Directory>
 </VirtualHost>
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143b.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143b.conf
index 25655a07c..4df497ab2 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143b.conf
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143b.conf
@@ -1,10 +1,9 @@
-
-<VirtualHost 173.192.30.7:443 [2607:f0d0:1005:99::3:1337]:443>
-DocumentRoot /xxxx/
-ServerName noodles.net.nz
-ServerAlias www.noodles.net.nz
-CustomLog ${APACHE_LOG_DIR}/domlogs/noodles.log combined
-<Directory "xxxx">
+<VirtualHost *:443 [::]:443>
+DocumentRoot /var/www/html/
+ServerName example.com
+ServerAlias www.example.com
+CustomLog ${APACHE_LOG_DIR}/example.log combined
+<Directory "/var/www/html/">
   AllowOverride All
 </Directory>
 
@@ -14,8 +13,9 @@ CustomLog ${APACHE_LOG_DIR}/domlogs/noodles.log combined
   SSLProtocol all -SSLv2 -SSLv3
   SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH +aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"
 
-   SSLCertificateFile /xxxx/noodles.net.nz.crt
-   SSLCertificateKeyFile /xxxx/noodles.net.nz.key
+   SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+   SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
 
    Header set Strict-Transport-Security "max-age=31536000; preload"
 </VirtualHost>
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143c.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143c.conf
index f75dd7850..40670b336 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143c.conf
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143c.conf
@@ -1,9 +1,9 @@
-<VirtualHost [2607:f0d0:1005:99::3:1337]:80 173.192.30.7:80>
-DocumentRoot /xxxx/
-ServerName noodles.net.nz
-ServerAlias www.noodles.net.nz
-CustomLog ${APACHE_LOG_DIR}/domlogs/noodles.log combined
-<Directory "/xxxx/">
+<VirtualHost [::]:80 *:80>
+DocumentRoot /var/www/html/
+ServerName example.com
+ServerAlias www.example.com
+CustomLog ${APACHE_LOG_DIR}/example.log combined
+<Directory "/var/www/html/">
   AllowOverride All
 </Directory>
 </VirtualHost>
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143d.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143d.conf
index f16b412da..813c41b62 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143d.conf
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/ipv6-1143d.conf
@@ -1,9 +1,21 @@
-<VirtualHost [2607:f0d0:1005:99::3:1337] 173.192.30.7:80>
-DocumentRoot /xxxx/
-ServerName noodles.net.nz
-ServerAlias www.noodles.net.nz
-CustomLog ${APACHE_LOG_DIR}/domlogs/noodles.log combined
-<Directory "/xxxx/">
+<VirtualHost [::]:443 *:443>
+DocumentRoot /var/www/html/
+ServerName example.com
+ServerAlias www.example.com
+CustomLog ${APACHE_LOG_DIR}/example.log combined
+<Directory "/var/www/html/">
   AllowOverride All
 </Directory>
+
+  SSLEngine on
+
+  SSLHonorCipherOrder On
+  SSLProtocol all -SSLv2 -SSLv3
+  SSLCipherSuite "EECDH+ECDSA+AESGCM EECDH+aRSA+AESGCM EECDH+ECDSA+SHA384 EECDH+ECDSA+SHA256 EECDH+aRSA+SHA384 EECDH+aRSA+SHA256 EECDH+aRSA+RC4 EECDH EDH +aRSA RC4 !aNULL !eNULL !LOW !3DES !MD5 !EXP !PSK !SRP !DSS"
+
+   SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
+   SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
+
+
+   Header set Strict-Transport-Security "max-age=31536000; preload"
 </VirtualHost>