Prep for testfarming.

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
+    Cleanup
-        sudo rm /etc/apache2/sites-{enabled,available}/"$f"
-    else
-        sudo mv "$TMP" "$APPEND_APACHECONF"
-    fi
 done
 if [ "$FAILS" -ne 0 ] ; then
     exit 1

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