From 833f87d0056ae661c9cea2c50c69b6406a8f5ae3 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Thu, 5 Jul 2018 17:41:22 -0700
Subject: [PATCH] no apache

---
 .travis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc872cc59..a36726c12 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,6 @@ cache:
 
 before_install:
   - '([ $TRAVIS_OS_NAME == linux ] && dpkg -s libaugeas0) || (brew update && brew install augeas python3 && brew upgrade python && brew link python)'
-  - 'if [ -n "$INSTALL_APACHE" ] ; then sudo apt-get install apache2 libapache2-mod-wsgi -y && sudo service apache2 stop ; fi'
-  - 'if [ -n "$INSTALL_NGINX" -o -n "$BOULDER_INTEGRATION" ] ; then sudo apt-get install nginx-light -y && sudo service nginx stop ; fi'
 
 before_script:
   - 'if [ $TRAVIS_OS_NAME = osx ] ; then ulimit -n 1024 ; fi'
@@ -48,7 +46,7 @@ matrix:
       sudo: required
       services: docker
     - sudo: required
-      env: INSTALL_APACHE=1 TOXENV=apache_compat
+      env: TOXENV=apache_compat
       services: docker
       before_install:
       addons:
@@ -89,6 +87,8 @@ addons:
     - libssl-dev
     - libffi-dev
     - ca-certificates
+    # For certbot-nginx integration testing
+    - nginx-light
     - openssl
 
 install: "travis_retry $(command -v pip || command -v pip3) install tox coveralls"