From e7226d28041a03a8f2d6d61ac84e765e8235a180 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 16:43:24 -0800
Subject: [PATCH 01/24] Automate testing with the apache-conf-library

---
 tests/apache-conf-files/hackish-apache-test | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index c6663551e..8efe65e42 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -18,11 +18,25 @@ function CleanupExit() {
     exit 1
 }
 
+FAILS=0
 trap CleanupExit INT
 for f in *.conf ; do 
-    echo testing "$f"
+    echo -n  testing "$f"...
     sudo cp "$f" "$EA"/sites-available/
     sudo ln -s "$EA/sites-available/$f" "$EA/sites-enabled/$f"
-    sudo "$LEROOT"/venv/bin/letsencrypt --apache  certonly -t
+    RESULT=`echo c | sudo "$LEROOT"/venv/bin/letsencrypt --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
+    if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
+        echo passed
+    else
+        echo failed
+        echo $RESULT
+        echo
+        echo
+        FAILS=`expr $FAILS + 1`
+    fi
     sudo rm /etc/apache2/sites-{enabled,available}/"$f"
 done
+if [ "$FAILS" -ne 0 ] ; then
+    return 1
+fi
+return 0

From 52705107ff76f1e713b9b903837e7c38c230f411 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 17:01:36 -0800
Subject: [PATCH 02/24] let the environment determine how letsencrypt is run

---
 tests/apache-conf-files/hackish-apache-test | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index 8efe65e42..e6f25b15f 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -9,6 +9,7 @@ export EA=/etc/apache2/
 TESTDIR="`dirname $0`"
 LEROOT="`realpath \"$TESTDIR/../../\"`"
 cd $TESTDIR/passing
+LETSENCRYPT="${LETSENCRYPT:-$LEROOT/venv/bin/letsencrypt}"
 
 function CleanupExit() {
     echo control c, exiting tests...
@@ -24,7 +25,7 @@ for f in *.conf ; do
     echo -n  testing "$f"...
     sudo cp "$f" "$EA"/sites-available/
     sudo ln -s "$EA/sites-available/$f" "$EA/sites-enabled/$f"
-    RESULT=`echo c | sudo "$LEROOT"/venv/bin/letsencrypt --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
+    RESULT=`echo c | sudo "$LETSENCRYPT" --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
         echo passed
     else

From 3c6af7094c67b37e8b815309fe0a492e232fccbf Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 17:21:47 -0800
Subject: [PATCH 03/24] Bugfix, and use --staging

---
 tests/apache-conf-files/hackish-apache-test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index e6f25b15f..c4df319ed 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -25,7 +25,7 @@ for f in *.conf ; do
     echo -n  testing "$f"...
     sudo cp "$f" "$EA"/sites-available/
     sudo ln -s "$EA/sites-available/$f" "$EA/sites-enabled/$f"
-    RESULT=`echo c | sudo "$LETSENCRYPT" --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
+    RESULT=`echo c | sudo "$LETSENCRYPT" --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
         echo passed
     else
@@ -38,6 +38,6 @@ for f in *.conf ; do
     sudo rm /etc/apache2/sites-{enabled,available}/"$f"
 done
 if [ "$FAILS" -ne 0 ] ; then
-    return 1
+    exit 1
 fi
-return 0
+exit 0

From bf764e4852dcf061e586789455afcb9785f39e3f Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 18:01:49 -0800
Subject: [PATCH 04/24] Support appending to non-Debianish Apache setups

---
 tests/apache-conf-files/hackish-apache-test | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index c4df319ed..99fa123f7 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -23,8 +23,14 @@ FAILS=0
 trap CleanupExit INT
 for f in *.conf ; do 
     echo -n  testing "$f"...
-    sudo cp "$f" "$EA"/sites-available/
-    sudo ln -s "$EA/sites-available/$f" "$EA/sites-enabled/$f"
+    if [ "$APPEND_APACHECONF" = "" ] ; then
+        sudo cp "$f" "$EA"/sites-available/
+        sudo ln -sf "$EA/sites-available/$f" "$EA/sites-enabled/$f"
+    else
+        TMP="/tmp/`basename \"$APPEND_APACHECONF\"`.$$"
+        sudo cp -a "$APPEND_APACHECONF" "$TMP"
+        sudo bash -c "cat \"$f\" >> \"$APPEND_APACHECONF\""
+    fi
     RESULT=`echo c | sudo "$LETSENCRYPT" --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
         echo passed
@@ -35,7 +41,11 @@ for f in *.conf ; do
         echo
         FAILS=`expr $FAILS + 1`
     fi
-    sudo rm /etc/apache2/sites-{enabled,available}/"$f"
+    if [ "$APPEND_APACHECONF" = "" ] ; then
+        sudo rm /etc/apache2/sites-{enabled,available}/"$f"
+    else
+        sudo mv "$TMP" "$APPEND_APACHECONF"
+    fi
 done
 if [ "$FAILS" -ne 0 ] ; then
     exit 1

From 9013fecc9cea8bfca8e29789520772c3bd96cd51 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 19:41:35 -0800
Subject: [PATCH 05/24] Prep for testfarming.

---
 tests/apache-conf-files/hackish-apache-test    | 16 ++++++++++------
 tests/apache-conf-files/passing/README.modules |  3 +--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index 99fa123f7..3d4336579 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -14,11 +14,19 @@ LETSENCRYPT="${LETSENCRYPT:-$LEROOT/venv/bin/letsencrypt}"
 function CleanupExit() {
     echo control c, exiting tests...
     if [ "$f" != "" ] ; then
-        sudo rm /etc/apache2/sites-{enabled,available}/"$f"
+        Cleanup
     fi
     exit 1
 }
 
+function Cleanup() {
+    if [ "$APPEND_APACHECONF" = "" ] ; then
+        sudo rm /etc/apache2/sites-{enabled,available}/"$f"
+    else
+        sudo mv "$TMP" "$APPEND_APACHECONF"
+    fi
+}
+
 FAILS=0
 trap CleanupExit INT
 for f in *.conf ; do 
@@ -41,11 +49,7 @@ for f in *.conf ; do
         echo
         FAILS=`expr $FAILS + 1`
     fi
-    if [ "$APPEND_APACHECONF" = "" ] ; then
-        sudo rm /etc/apache2/sites-{enabled,available}/"$f"
-    else
-        sudo mv "$TMP" "$APPEND_APACHECONF"
-    fi
+    Cleanup
 done
 if [ "$FAILS" -ne 0 ] ; then
     exit 1
diff --git a/tests/apache-conf-files/passing/README.modules b/tests/apache-conf-files/passing/README.modules
index 7edbd3e84..32c3ef019 100644
--- a/tests/apache-conf-files/passing/README.modules
+++ b/tests/apache-conf-files/passing/README.modules
@@ -1,5 +1,4 @@
-Modules required to parse these conf files:
-
+# Modules required to parse these conf files:
 ssl
 rewrite
 macro

From babb33991bffb51fd82acc75afa87ce4774168c4 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 19:51:45 -0800
Subject: [PATCH 06/24] Neaten things with a Setup() function

---
 tests/apache-conf-files/hackish-apache-test | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index 3d4336579..b8caaadc0 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -19,6 +19,17 @@ function CleanupExit() {
     exit 1
 }
 
+function Setup() {
+    if [ "$APPEND_APACHECONF" = "" ] ; then
+        sudo cp "$f" "$EA"/sites-available/
+        sudo ln -sf "$EA/sites-available/$f" "$EA/sites-enabled/$f"
+    else
+        TMP="/tmp/`basename \"$APPEND_APACHECONF\"`.$$"
+        sudo cp -a "$APPEND_APACHECONF" "$TMP"
+        sudo bash -c "cat \"$f\" >> \"$APPEND_APACHECONF\""
+    fi
+}
+
 function Cleanup() {
     if [ "$APPEND_APACHECONF" = "" ] ; then
         sudo rm /etc/apache2/sites-{enabled,available}/"$f"
@@ -31,14 +42,7 @@ FAILS=0
 trap CleanupExit INT
 for f in *.conf ; do 
     echo -n  testing "$f"...
-    if [ "$APPEND_APACHECONF" = "" ] ; then
-        sudo cp "$f" "$EA"/sites-available/
-        sudo ln -sf "$EA/sites-available/$f" "$EA/sites-enabled/$f"
-    else
-        TMP="/tmp/`basename \"$APPEND_APACHECONF\"`.$$"
-        sudo cp -a "$APPEND_APACHECONF" "$TMP"
-        sudo bash -c "cat \"$f\" >> \"$APPEND_APACHECONF\""
-    fi
+    Setup
     RESULT=`echo c | sudo "$LETSENCRYPT" --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
         echo passed

From 03fdd03a878ce1451c6e766f32421e604ceb4f72 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 19:52:35 -0800
Subject: [PATCH 07/24] Experimentally try travis with the hackish-apache-test

---
 .travis.yml | 1 +
 tox.ini     | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8dde06ceb..2b37c1bef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ env:
     - TOXENV=py27 BOULDER_INTEGRATION=1
     - TOXENV=lint
     - TOXENV=cover
+    - TOXENV=hackishapachetest
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
diff --git a/tox.ini b/tox.ini
index d1fafe20f..cffbc4e18 100644
--- a/tox.ini
+++ b/tox.ini
@@ -67,3 +67,10 @@ commands =
     pylint --rcfile=.pylintrc letsencrypt-nginx/letsencrypt_nginx
     pylint --rcfile=.pylintrc letsencrypt-compatibility-test/letsencrypt_compatibility_test
     pylint --rcfile=.pylintrc letshelp-letsencrypt/letshelp_letsencrypt
+
+[testenv:hackishapachetest]
+basepython = python2.7
+setenv =
+    LETSENCRYPT=letsencrypt
+commands =
+    ./tests/apache-conf-files/hackish-apache-test

From 9129dcbc8797f67d85d04fa29541b5cec446e2ce Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 16 Dec 2015 20:04:27 -0800
Subject: [PATCH 08/24] Make sure there's always a domain name to prompt a
 question

---
 tests/apache-conf-files/hackish-apache-test | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/apache-conf-files/hackish-apache-test b/tests/apache-conf-files/hackish-apache-test
index b8caaadc0..27ee0fdf0 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/tests/apache-conf-files/hackish-apache-test
@@ -23,6 +23,13 @@ function Setup() {
     if [ "$APPEND_APACHECONF" = "" ] ; then
         sudo cp "$f" "$EA"/sites-available/
         sudo ln -sf "$EA/sites-available/$f" "$EA/sites-enabled/$f"
+        sudo echo """
+<VirtualHost *:80>
+    ServerName example.com
+    DocumentRoot /tmp/
+    ErrorLog /tmp/error.log
+    CustomLog /tmp/requests.log combined
+</VirtualHost>""" >> $EA/sites-available/throwaway-example.conf
     else
         TMP="/tmp/`basename \"$APPEND_APACHECONF\"`.$$"
         sudo cp -a "$APPEND_APACHECONF" "$TMP"
@@ -33,6 +40,7 @@ function Setup() {
 function Cleanup() {
     if [ "$APPEND_APACHECONF" = "" ] ; then
         sudo rm /etc/apache2/sites-{enabled,available}/"$f"
+        sudo rm $EA/sites-available/throwaway-example.conf
     else
         sudo mv "$TMP" "$APPEND_APACHECONF"
     fi

From d777e7fabad3f379c266382a36f970a13e85cf12 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Thu, 17 Dec 2015 15:45:47 -0800
Subject: [PATCH 09/24] This sort of works in tox; travis is unlikely due to
 sudo

---
 .travis.yml                                                     | 1 +
 .../letsencrypt_apache/tests}/apache-conf-files/NEEDED.txt      | 0
 .../tests}/apache-conf-files/failing/ipv6-1143.conf             | 0
 .../tests}/apache-conf-files/failing/ipv6-1143b.conf            | 0
 .../apache-conf-files/failing/missing-double-quote-1724.conf    | 0
 .../tests}/apache-conf-files/failing/multivhost-1093.conf       | 0
 .../tests}/apache-conf-files/failing/multivhost-1093b.conf      | 0
 .../tests}/apache-conf-files/hackish-apache-test                | 2 +-
 .../tests}/apache-conf-files/passing/1626-1531.conf             | 0
 .../tests}/apache-conf-files/passing/README.modules             | 0
 .../tests}/apache-conf-files/passing/anarcat-1531.conf          | 0
 .../passing/drupal-errordocument-arg-1724.conf                  | 0
 .../tests}/apache-conf-files/passing/drupal-htaccess-1531.conf  | 0
 .../tests}/apache-conf-files/passing/example-1755.conf          | 0
 .../tests}/apache-conf-files/passing/example-ssl.conf           | 0
 .../tests}/apache-conf-files/passing/example.conf               | 0
 .../apache-conf-files/passing/finalize-1243.apache2.conf.txt    | 0
 .../tests}/apache-conf-files/passing/finalize-1243.conf         | 0
 .../tests}/apache-conf-files/passing/missing-quote-1724.conf    | 0
 .../tests}/apache-conf-files/passing/modmacro-1385.conf         | 0
 .../tests}/apache-conf-files/passing/owncloud-1264.conf         | 0
 .../tests}/apache-conf-files/passing/roundcube-1222.conf        | 0
 .../tests}/apache-conf-files/passing/semacode-1598.conf         | 0
 .../apache-conf-files/passing/sslrequire-wordlist-1827.htaccess | 0
 .../apache-conf-files/passing/two-blocks-one-line-1693.conf     | 0
 tox.ini                                                         | 2 +-
 26 files changed, 3 insertions(+), 2 deletions(-)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/NEEDED.txt (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/failing/ipv6-1143.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/failing/ipv6-1143b.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/failing/missing-double-quote-1724.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/failing/multivhost-1093.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/failing/multivhost-1093b.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/hackish-apache-test (97%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/1626-1531.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/README.modules (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/anarcat-1531.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/drupal-errordocument-arg-1724.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/drupal-htaccess-1531.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/example-1755.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/example-ssl.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/example.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/finalize-1243.apache2.conf.txt (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/finalize-1243.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/missing-quote-1724.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/modmacro-1385.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/owncloud-1264.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/roundcube-1222.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/semacode-1598.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/two-blocks-one-line-1693.conf (100%)

diff --git a/.travis.yml b/.travis.yml
index 2b37c1bef..dfbc09e2e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 services:
   - rabbitmq
   - mariadb
+  - apache2
 
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 # gimme has to be kept in sync with Boulder's Go version setting in .travis.yml
diff --git a/tests/apache-conf-files/NEEDED.txt b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt
similarity index 100%
rename from tests/apache-conf-files/NEEDED.txt
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/NEEDED.txt
diff --git a/tests/apache-conf-files/failing/ipv6-1143.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143.conf
similarity index 100%
rename from tests/apache-conf-files/failing/ipv6-1143.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143.conf
diff --git a/tests/apache-conf-files/failing/ipv6-1143b.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143b.conf
similarity index 100%
rename from tests/apache-conf-files/failing/ipv6-1143b.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/ipv6-1143b.conf
diff --git a/tests/apache-conf-files/failing/missing-double-quote-1724.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
similarity index 100%
rename from tests/apache-conf-files/failing/missing-double-quote-1724.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/missing-double-quote-1724.conf
diff --git a/tests/apache-conf-files/failing/multivhost-1093.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093.conf
similarity index 100%
rename from tests/apache-conf-files/failing/multivhost-1093.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093.conf
diff --git a/tests/apache-conf-files/failing/multivhost-1093b.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
similarity index 100%
rename from tests/apache-conf-files/failing/multivhost-1093b.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/failing/multivhost-1093b.conf
diff --git a/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
similarity index 97%
rename from tests/apache-conf-files/hackish-apache-test
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
index 27ee0fdf0..9e828bf2d 100755
--- a/tests/apache-conf-files/hackish-apache-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
@@ -7,7 +7,7 @@
 # assess, but it should be automated
 export EA=/etc/apache2/ 
 TESTDIR="`dirname $0`"
-LEROOT="`realpath \"$TESTDIR/../../\"`"
+LEROOT="`realpath \"$TESTDIR/../../../../\"`"
 cd $TESTDIR/passing
 LETSENCRYPT="${LETSENCRYPT:-$LEROOT/venv/bin/letsencrypt}"
 
diff --git a/tests/apache-conf-files/passing/1626-1531.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/1626-1531.conf
similarity index 100%
rename from tests/apache-conf-files/passing/1626-1531.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/1626-1531.conf
diff --git a/tests/apache-conf-files/passing/README.modules b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/README.modules
similarity index 100%
rename from tests/apache-conf-files/passing/README.modules
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/README.modules
diff --git a/tests/apache-conf-files/passing/anarcat-1531.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/anarcat-1531.conf
similarity index 100%
rename from tests/apache-conf-files/passing/anarcat-1531.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/anarcat-1531.conf
diff --git a/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
similarity index 100%
rename from tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-errordocument-arg-1724.conf
diff --git a/tests/apache-conf-files/passing/drupal-htaccess-1531.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
similarity index 100%
rename from tests/apache-conf-files/passing/drupal-htaccess-1531.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/drupal-htaccess-1531.conf
diff --git a/tests/apache-conf-files/passing/example-1755.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-1755.conf
similarity index 100%
rename from tests/apache-conf-files/passing/example-1755.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-1755.conf
diff --git a/tests/apache-conf-files/passing/example-ssl.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-ssl.conf
similarity index 100%
rename from tests/apache-conf-files/passing/example-ssl.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example-ssl.conf
diff --git a/tests/apache-conf-files/passing/example.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example.conf
similarity index 100%
rename from tests/apache-conf-files/passing/example.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/example.conf
diff --git a/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
similarity index 100%
rename from tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.apache2.conf.txt
diff --git a/tests/apache-conf-files/passing/finalize-1243.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf
similarity index 100%
rename from tests/apache-conf-files/passing/finalize-1243.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/finalize-1243.conf
diff --git a/tests/apache-conf-files/passing/missing-quote-1724.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
similarity index 100%
rename from tests/apache-conf-files/passing/missing-quote-1724.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/missing-quote-1724.conf
diff --git a/tests/apache-conf-files/passing/modmacro-1385.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/modmacro-1385.conf
similarity index 100%
rename from tests/apache-conf-files/passing/modmacro-1385.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/modmacro-1385.conf
diff --git a/tests/apache-conf-files/passing/owncloud-1264.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/owncloud-1264.conf
similarity index 100%
rename from tests/apache-conf-files/passing/owncloud-1264.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/owncloud-1264.conf
diff --git a/tests/apache-conf-files/passing/roundcube-1222.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/roundcube-1222.conf
similarity index 100%
rename from tests/apache-conf-files/passing/roundcube-1222.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/roundcube-1222.conf
diff --git a/tests/apache-conf-files/passing/semacode-1598.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/semacode-1598.conf
similarity index 100%
rename from tests/apache-conf-files/passing/semacode-1598.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/semacode-1598.conf
diff --git a/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
similarity index 100%
rename from tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/sslrequire-wordlist-1827.htaccess
diff --git a/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
similarity index 100%
rename from tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/two-blocks-one-line-1693.conf
diff --git a/tox.ini b/tox.ini
index cffbc4e18..1d2f12e6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -73,4 +73,4 @@ basepython = python2.7
 setenv =
     LETSENCRYPT=letsencrypt
 commands =
-    ./tests/apache-conf-files/hackish-apache-test
+    sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test

From a819ee146d6369ab08fe022ae3f7481e50d32ed9 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Thu, 17 Dec 2015 18:03:34 -0800
Subject: [PATCH 10/24] Experimentally try sudo in travis

This may decontainerise us, so we might not want to merge even if it works...
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dfbc09e2e..a0ca6576f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,7 +35,7 @@ branches:
     - /^test-.*$/
 
 # container-based infrastructure
-sudo: false
+sudo: true
 
 addons:
   # make sure simplehttp simple verification works (custom /etc/hosts)

From 7a16e2e2489bceb6cb88e21e0fa0d75900572250 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Fri, 18 Dec 2015 00:17:22 -0800
Subject: [PATCH 11/24] Wrangle things to actually run in travis

---
 .travis.yml                                           | 11 +++++++----
 .../tests/apache-conf-files/hackish-apache-test       |  1 +
 tox.ini                                               |  5 +++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a0ca6576f..b1fe7f55d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,11 @@ env:
     - GOPATH=/tmp/go
     - PATH=$GOPATH/bin:$PATH
   matrix:
-    - TOXENV=py26 BOULDER_INTEGRATION=1
-    - TOXENV=py27 BOULDER_INTEGRATION=1
-    - TOXENV=lint
-    - TOXENV=cover
     - TOXENV=hackishapachetest
+#    - TOXENV=py26 BOULDER_INTEGRATION=1
+#    - TOXENV=py27 BOULDER_INTEGRATION=1
+#    - TOXENV=lint
+#    - TOXENV=cover
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -60,6 +60,9 @@ addons:
     - openssl
     # For Boulder integration testing
     - rsyslog
+    # for hackishapachetest
+    - realpath
+    - apache2
 
 install: "travis_retry pip install tox coveralls"
 script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/travis-integration.sh)'
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
index 9e828bf2d..664423d7a 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
@@ -51,6 +51,7 @@ trap CleanupExit INT
 for f in *.conf ; do 
     echo -n  testing "$f"...
     Setup
+    echo running from $PWD
     RESULT=`echo c | sudo "$LETSENCRYPT" --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
         echo passed
diff --git a/tox.ini b/tox.ini
index 1d2f12e6c..1a637777d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,8 +69,9 @@ commands =
     pylint --rcfile=.pylintrc letshelp-letsencrypt/letshelp_letsencrypt
 
 [testenv:hackishapachetest]
-basepython = python2.7
+#basepython = python2.7
 setenv =
-    LETSENCRYPT=letsencrypt
+    LETSENCRYPT=/home/travis/build/letsencrypt/letsencrypt/.tox/hackishapachetest/bin/letsencrypt    
 commands =
+    pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
     sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test

From 8d71b2d6c38aa062ef20a4cb10d7e9fb4cc345c3 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Fri, 18 Dec 2015 08:48:49 -0800
Subject: [PATCH 12/24] Install Apache modules in travis

---
 .travis.yml                                         |  2 ++
 .../tests/apache-conf-files/hackish-apache-test     | 13 +++++++++++--
 tox.ini                                             |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b1fe7f55d..6b0af69c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,6 +63,8 @@ addons:
     # for hackishapachetest
     - realpath
     - apache2
+    - libapache2-mod-wsgi
+    - sudo
 
 install: "travis_retry pip install tox coveralls"
 script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/travis-integration.sh)'
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
index 664423d7a..cf06b48af 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
@@ -46,13 +46,22 @@ function Cleanup() {
     fi
 }
 
+# if our environment asks us to enable modules, do our best!
+if [ "$1" = --debian-modules ] ; then
+    sudo apt-get install -y libapache2-mod-wsgi
+
+    for mod in  ssl rewrite macro wsgi deflate ; do
+        sudo a2enmod $mod
+    done
+fi
+
+
 FAILS=0
 trap CleanupExit INT
 for f in *.conf ; do 
     echo -n  testing "$f"...
     Setup
-    echo running from $PWD
-    RESULT=`echo c | sudo "$LETSENCRYPT" --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
+    RESULT=`echo c | sudo "$LETSENCRYPT" -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
     if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
         echo passed
     else
diff --git a/tox.ini b/tox.ini
index 1a637777d..abb934055 100644
--- a/tox.ini
+++ b/tox.ini
@@ -74,4 +74,4 @@ setenv =
     LETSENCRYPT=/home/travis/build/letsencrypt/letsencrypt/.tox/hackishapachetest/bin/letsencrypt    
 commands =
     pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
-    sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
+    sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test --debian-modules

From a0e902d405e8cd4bd3b584847ec8636affc818e0 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Fri, 18 Dec 2015 11:43:20 -0800
Subject: [PATCH 13/24] More module deps!

---
 .../tests/apache-conf-files/hackish-apache-test               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
index cf06b48af..bfe71cc51 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
@@ -48,9 +48,9 @@ function Cleanup() {
 
 # if our environment asks us to enable modules, do our best!
 if [ "$1" = --debian-modules ] ; then
-    sudo apt-get install -y libapache2-mod-wsgi
+    sudo apt-get install -y libapache2-mod-{wsgi,macro}
 
-    for mod in  ssl rewrite macro wsgi deflate ; do
+    for mod in  ssl rewrite macro wsgi deflate userdir version ; do
         sudo a2enmod $mod
     done
 fi

From 05e210d42ad5fe38a4b1b66a659e6dfe3d77e736 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Fri, 18 Dec 2015 11:44:52 -0800
Subject: [PATCH 14/24] Also add dependencies to travis.yml

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 6b0af69c3..ab1931be1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -64,6 +64,7 @@ addons:
     - realpath
     - apache2
     - libapache2-mod-wsgi
+    - libapache2-mod-macro
     - sudo
 
 install: "travis_retry pip install tox coveralls"

From 47f7e70b764c4b5c760256659260059afee14df2 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Mon, 21 Dec 2015 13:49:46 -0800
Subject: [PATCH 15/24] This is a more correct test

---
 .../tests/apache-conf-files/hackish-apache-test                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
index bfe71cc51..c661e6435 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
@@ -62,7 +62,7 @@ for f in *.conf ; do
     echo -n  testing "$f"...
     Setup
     RESULT=`echo c | sudo "$LETSENCRYPT" -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1`
-    if echo $RESULT | grep -Eq \("Please specify --domains"\|"mod_macro is not yet"\) ; then
+    if echo $RESULT | grep -Eq \("Which names would you like"\|"mod_macro is not yet"\) ; then
         echo passed
     else
         echo failed

From e41ddd2cc7210563506bb5107841cfb76c27c6e2 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Tue, 22 Dec 2015 15:50:48 -0800
Subject: [PATCH 16/24] Rename hackishapachetest -> apacheconftest

Reenable other travis tests as well as this one
---
 .travis.yml                                            | 10 +++++-----
 .../{hackish-apache-test => apache-conf-test}          |  0
 tox.ini                                                |  6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/{hackish-apache-test => apache-conf-test} (100%)

diff --git a/.travis.yml b/.travis.yml
index ab1931be1..9efb95165 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,11 +19,11 @@ env:
     - GOPATH=/tmp/go
     - PATH=$GOPATH/bin:$PATH
   matrix:
-    - TOXENV=hackishapachetest
-#    - TOXENV=py26 BOULDER_INTEGRATION=1
-#    - TOXENV=py27 BOULDER_INTEGRATION=1
-#    - TOXENV=lint
-#    - TOXENV=cover
+    - TOXENV=py26 BOULDER_INTEGRATION=1
+    - TOXENV=py27 BOULDER_INTEGRATION=1
+    - TOXENV=lint
+    - TOXENV=cover
+    - TOXENV=apacheconftest
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
similarity index 100%
rename from letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
diff --git a/tox.ini b/tox.ini
index abb934055..aac7c15eb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -68,10 +68,10 @@ commands =
     pylint --rcfile=.pylintrc letsencrypt-compatibility-test/letsencrypt_compatibility_test
     pylint --rcfile=.pylintrc letshelp-letsencrypt/letshelp_letsencrypt
 
-[testenv:hackishapachetest]
+[testenv:apacheconftest]
 #basepython = python2.7
 setenv =
-    LETSENCRYPT=/home/travis/build/letsencrypt/letsencrypt/.tox/hackishapachetest/bin/letsencrypt    
+    LETSENCRYPT=/home/travis/build/letsencrypt/letsencrypt/.tox/apacheconftest/bin/letsencrypt
 commands =
     pip install -e acme -e .[dev] -e letsencrypt-apache -e letsencrypt-nginx -e letsencrypt-compatibility-test -e letshelp-letsencrypt
-    sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/hackish-apache-test --debian-modules
+    sudo ./letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test --debian-modules

From ef1973ae2888232a5b19d2c5dae4783506ccf83c Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Tue, 22 Dec 2015 15:58:09 -0800
Subject: [PATCH 17/24] Move recently included tests to the new
 apache-conf-test location

---
 .../tests}/apache-conf-files/passing/graphite-quote-1934.conf     | 0
 .../tests}/apache-conf-files/passing/rewrite-quote-1960.conf      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/graphite-quote-1934.conf (100%)
 rename {tests => letsencrypt-apache/letsencrypt_apache/tests}/apache-conf-files/passing/rewrite-quote-1960.conf (100%)

diff --git a/tests/apache-conf-files/passing/graphite-quote-1934.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
similarity index 100%
rename from tests/apache-conf-files/passing/graphite-quote-1934.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
diff --git a/tests/apache-conf-files/passing/rewrite-quote-1960.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf
similarity index 100%
rename from tests/apache-conf-files/passing/rewrite-quote-1960.conf
rename to letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/rewrite-quote-1960.conf

From d9ea151fbb2c54e5dc390b23590857de7f02cf73 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Tue, 22 Dec 2015 16:04:30 -0800
Subject: [PATCH 18/24] Tweak the graphite config file so that apacheconftest
 passes again

  (At least on debian and other systems that have a www-data user...)
---
 .../tests/apache-conf-files/passing/graphite-quote-1934.conf    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
index 2a8734b43..f257dd9a8 100644
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/passing/graphite-quote-1934.conf
@@ -1,6 +1,6 @@
 <VirtualHost *:80>
 
-        WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=_graphite group=_graphite
+        WSGIDaemonProcess _graphite processes=5 threads=5 display-name='%{GROUP}' inactivity-timeout=120 user=www-data group=www-data
         WSGIProcessGroup _graphite
         WSGIImportScript /usr/share/graphite-web/graphite.wsgi process-group=_graphite application-group=%{GLOBAL}
         WSGIScriptAlias / /usr/share/graphite-web/graphite.wsgi

From 068504ddbf2d4943d4254e8bf0a8904cd347f7cd Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Tue, 22 Dec 2015 17:19:01 -0800
Subject: [PATCH 19/24] Correct comment

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9efb95165..4e0849e3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,7 +60,7 @@ addons:
     - openssl
     # For Boulder integration testing
     - rsyslog
-    # for hackishapachetest
+    # for apacheconftest
     - realpath
     - apache2
     - libapache2-mod-wsgi

From 6db40626196c790af20e5834f5b85432dd358cb8 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 23 Dec 2015 10:45:08 -0800
Subject: [PATCH 20/24] Split module installation into substeps

 - This may prevent failures if one thing is uninstallable
---
 .../tests/apache-conf-files/apache-conf-test                   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
index c661e6435..38d5f05c7 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
@@ -48,7 +48,8 @@ function Cleanup() {
 
 # if our environment asks us to enable modules, do our best!
 if [ "$1" = --debian-modules ] ; then
-    sudo apt-get install -y libapache2-mod-{wsgi,macro}
+    sudo apt-get install -y libapache2-mod-wsgi
+    sudo apt-get install -y libapache2-mod-macro
 
     for mod in  ssl rewrite macro wsgi deflate userdir version ; do
         sudo a2enmod $mod

From 494e6e77110c6af028df31ad270bfa70d1658ad2 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 23 Dec 2015 10:53:13 -0800
Subject: [PATCH 21/24] Remove TODO that has been done

---
 .../letsencrypt_apache/tests/apache-conf-files/apache-conf-test | 2 --
 1 file changed, 2 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
index 38d5f05c7..ec0041534 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
@@ -3,8 +3,6 @@
 # A hackish script to see if the client is behaving as expected 
 # with each of the "passing" conf files.
 
-# TODO presently this requires interaction and human judgement to 
-# assess, but it should be automated
 export EA=/etc/apache2/ 
 TESTDIR="`dirname $0`"
 LEROOT="`realpath \"$TESTDIR/../../../../\"`"

From 3dc3df4b345ee45d3b5d28a71fb1379d2e064446 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 23 Dec 2015 10:58:28 -0800
Subject: [PATCH 22/24] Document the inclusion of apacheconftest in tox

---
 docs/contributing.rst | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index c71aefeec..6c70830b8 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -65,8 +65,14 @@ Testing
 
 The following tools are there to help you:
 
-- ``tox`` starts a full set of tests. Please make sure you run it
-  before submitting a new pull request.
+- ``tox`` starts a full set of tests. Please note that it includes
+  apacheconftest, which uses the system's Apache install to test config file
+  parsing, so it should only be run on systems that have an
+  experimental, non-production Apache2 install on them.  ``tox -e
+  apacheconftest`` can be used to run those specific Apache conf tests.
+
+- ``tox -e py27``, ``tox -e py26`` etc, run unit tests for specific Python
+  versions.
 
 - ``tox -e cover`` checks the test coverage only. Calling the
   ``./tox.cover.sh`` script directly (or even ``./tox.cover.sh $pkg1

From ce9e3c1f94213d1c2158664436505e22e732e216 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 23 Dec 2015 15:00:07 -0800
Subject: [PATCH 23/24] Some OSes don't enable the mime module by default?

---
 .../letsencrypt_apache/tests/apache-conf-files/apache-conf-test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
index ec0041534..4e0443bb7 100755
--- a/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
+++ b/letsencrypt-apache/letsencrypt_apache/tests/apache-conf-files/apache-conf-test
@@ -49,7 +49,7 @@ if [ "$1" = --debian-modules ] ; then
     sudo apt-get install -y libapache2-mod-wsgi
     sudo apt-get install -y libapache2-mod-macro
 
-    for mod in  ssl rewrite macro wsgi deflate userdir version ; do
+    for mod in  ssl rewrite macro wsgi deflate userdir version mime ; do
         sudo a2enmod $mod
     done
 fi

From f20cd73e8dc1e16ecff9d1161ec73076c05f836d Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Sat, 26 Dec 2015 20:13:45 -0800
Subject: [PATCH 24/24] For now, disable apacheconftest in travis :(

---
 .travis.yml | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4e0849e3b..a5d6d8a85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,8 @@ language: python
 services:
   - rabbitmq
   - mariadb
-  - apache2
+  # apacheconftest
+  #- apache2
 
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 # gimme has to be kept in sync with Boulder's Go version setting in .travis.yml
@@ -23,7 +24,9 @@ env:
     - TOXENV=py27 BOULDER_INTEGRATION=1
     - TOXENV=lint
     - TOXENV=cover
-    - TOXENV=apacheconftest
+# Disabled for now due to requiring sudo -> causing more boulder integration
+# DNS timeouts :(
+#    - TOXENV=apacheconftest
 
 
 # Only build pushes to the master branch, PRs, and branches beginning with
@@ -35,7 +38,7 @@ branches:
     - /^test-.*$/
 
 # container-based infrastructure
-sudo: true
+sudo: false
 
 addons:
   # make sure simplehttp simple verification works (custom /etc/hosts)
@@ -61,11 +64,11 @@ addons:
     # For Boulder integration testing
     - rsyslog
     # for apacheconftest
-    - realpath
-    - apache2
-    - libapache2-mod-wsgi
-    - libapache2-mod-macro
-    - sudo
+    #- realpath
+    #- apache2
+    #- libapache2-mod-wsgi
+    #- libapache2-mod-macro
+    #- sudo
 
 install: "travis_retry pip install tox coveralls"
 script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/travis-integration.sh)'