Merge ~rodsmith/maas-cert-server:fix-apt-mirror-failure into maas-cert-server:master

[Rod Smith]

This fixes a problem with the APT mirror operation brought on by pushing that operation into the background. Note that a few niceties are now impossible with the APT mirror occurring in the background -- old mirror contents can't be cleaned up, mainly, at least not without monitoring the download and kicking off the clean-up process when it's done.

[Jeff Lane  (bladernr)]

thanks for cleaning that up so quickly

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 0dec1e5..05eac75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maas-cert-server (0.3.4-0ppa1) bionic; urgency=medium
+
+  * The previous MR broke the APT mirror. This should fix it.
+
+ -- Rod Smith <[e-mail]>  Thu, 07 Jun 2018 17:55:06 -0700
+
 maas-cert-server (0.3.3-0ppa1) bionic; urgency=medium
 
   * Update to maniacs-setup so that it downloads the APT mirror,
diff --git a/usr/sbin/maniacs-setup b/usr/sbin/maniacs-setup
index cd23a92..631f551 100755
--- a/usr/sbin/maniacs-setup
+++ b/usr/sbin/maniacs-setup
@@ -418,7 +418,7 @@ mirror_archive() {
         echo "* current mirror config. Be careful choosing the releases to mirror to"
         echo "* avoid removing a release you are currently mirroring."
         echo "*"
-        get_yn "* Do you wisk to continue modifying the archive mirror config?" "N"
+        get_yn "* Do you wish to continue modifying the archive mirror config?" "N"
         echo
     else
         get_yn "* Do you want to mirror an archive site for local use" "N"
@@ -495,24 +495,13 @@ mirror_archive() {
         echo "* Creating archive mirror in the background. Check $MIRROR_TRACKER"
         echo "* for status information."
         echo "*"
+        mkdir -p $MCS_DATA
         apt-mirror &> $MCS_DATA/apt-mirror.out &
         echo "*"
-        echo "* Mirror operation complete."
-        # If we're re-running to update the mirror, this can free up a lot of
-        # space if we've opted to remove a release from the mirrored archives.
-        if [ -f $ARCHIVE_MIRROR/var/clean.sh ] ; then
-            echo "*"
-            echo "* If you are running this to update the archive mirrors, now we can"
-            echo "* run the cleanup script to remove unneeded archive files and free up"
-            echo "* some disk space."
-            get_yn "Would you like to run the cleanup script now?" "Y"
-            if [ $YN = "Y" ]; then
-                $ARCHIVE_MIRROR/var/clean.sh
-            else
-                echo "* You can run the cleanup script manually any time by running the command"
-                echo "* $ARCHIVE_MIRROR/var/clean.sh."
-            fi
-        fi
+        echo "* Mirror operation begun."
+        echo "*"
+        echo "* After the mirror operation completes, running"
+        echo "* $ARCHIVE_MIRROR/var/clean.sh can free up some disk space."
         ln -sf $ARCHIVE_MIRROR/mirror/$MIRROR_HOSTNAME/ubuntu /var/www/html/ubuntu
         ln -sf $ARCHIVE_MIRROR/mirror/ppa.launchpad.net/* /var/www/html/
         [ -e $ARCHIVE_MIRROR/mirror/maas.ubuntu.com ] && ln -sf $ARCHIVE_MIRROR/mirror/maas.ubuntu.com /var/www/html/