Neaten things with a Setup() function

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