Rename ACME_SERVER_URI and add default.

.travis.yml

@@ -58,7 +58,6 @@ matrix:
       addons:
     - python: "2.7"
       env:
-        - ACME_SERVER_URI="http://localhost:4000/directory"
         - BOULDER_FOR_TOX=1
         - TOXENV=apacheconftest
       sudo: required

certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test

@@ -3,8 +3,10 @@
 # A hackish script to see if the client is behaving as expected 
 # with each of the "passing" conf files.
 
-if [ -z "$ACME_SERVER_URI" ]; then
-    echo Please set ACME_SERVER_URI.
+SERVER="${SERVER:-http://localhost:4000/directory}"
+if ! curl "$SERVER" >/dev/null 2>&1; then
+    echo "ACME server not found."
+    echo "Please set SERVER to the ACME server's directory URL."
     exit 1
 fi
 
@@ -61,7 +63,7 @@ if [ "$1" = --debian-modules ] ; then
     done
 fi
 
-CERTBOT_CMD="sudo $(command -v certbot) --server $ACME_SERVER_URI -vvvv"
+CERTBOT_CMD="sudo $(command -v certbot) --server $SERVER -vvvv"
 CERTBOT_CMD="$CERTBOT_CMD --debug --apache --register-unsafely-without-email"
 CERTBOT_CMD="$CERTBOT_CMD --agree-tos certonly -t"
 

tests/letstest/scripts/test_apache2.sh

@@ -54,7 +54,7 @@ if [ $? -ne 0 ] ; then
 fi
 
 if [ "$OS_TYPE" = "ubuntu" ] ; then
-    export ACME_SERVER_URI="$BOULDER_URL"
+    export SERVER="$BOULDER_URL"
     venv/bin/tox -e apacheconftest
 else
     echo Not running hackish apache tests on $OS_TYPE

tox.ini

@@ -156,7 +156,7 @@ commands =
     {[base]pip_install} acme . certbot-apache certbot-compatibility-test
     {toxinidir}/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test --debian-modules
 passenv =
-    ACME_SERVER_URI
+    SERVER
 
 [testenv:nginxroundtrip]
 commands =