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] 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 b1fe7f55d92..6b0af69c3a6 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 664423d7a3f..cf06b48af8e 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 1a637777d81..abb934055fb 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