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

[Jeff Lane ]

Fixed race condition where we were trying to run chown on directories and files that don't exist yet when creating a local apt mirror.
fixed bug where we were overwriting mirror.list.orig every time maniacs-setup -m was called, instead of preserving any original mirror.list file
fixed bug where we were creating a symlink called \'*\' in /var/www/html when symlinking ppa mirror directories
Fixed messaging and output.

Several fixes around archive mirroring.

Mostly bug fixes, but one output improvement. Now when the backgrounded mirroring operation is complete, users will get a wall message on all terminals telling them the mirror is done and it's safe to start deploying systems.

[Rod Smith (rodsmith)]

LGTM.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 05eac75..0f36e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+maas-cert-server (0.3.5-0ppa1) bionic; urgency=medium
+
+  * Fixed several bugs in maniacs setup that affected archive mirroring
+
+ -- Jeff Lane <[e-mail]>  Thu, 06 Sep 2018 16:24:45 -0400
+
 maas-cert-server (0.3.4-0ppa1) bionic; urgency=medium
 
   * The previous MR broke the APT mirror. This should fix it.
diff --git a/usr/sbin/maniacs-setup b/usr/sbin/maniacs-setup
index 631f551..42de2fe 100755
--- a/usr/sbin/maniacs-setup
+++ b/usr/sbin/maniacs-setup
@@ -452,7 +452,7 @@ mirror_archive() {
             fi
         done
         # Preserve the stock mirror.list so that we only use our custom one
-        [ -f /etc/apt/mirror.list ] && mv /etc/apt/mirror.list /etc/apt/mirror.list.orig
+        [ -f /etc/apt/mirror.list.orig ] || ([ -f /etc/apt/mirror.list ] && mv /etc/apt/mirror.list /etc/apt/mirror.list.orig)
         cp -a /var/spool/apt-mirror/* $ARCHIVE_MIRROR
         write_starting_mirror_config
         get_yn "* Should this this computer to use the local mirror" "Y"
@@ -496,16 +496,16 @@ mirror_archive() {
         echo "* for status information."
         echo "*"
         mkdir -p $MCS_DATA
-        apt-mirror &> $MCS_DATA/apt-mirror.out &
+        (apt-mirror &> $MCS_DATA/apt-mirror.out; chown -R www-data:www-data $ARCHIVE_MIRROR/mirror/*; echo -e "Archive Mirror Action from MAAS Setup is now complete.\nYou should now be able to successfully deploy systems." |wall) &
         echo "*"
         echo "* Mirror operation begun."
         echo "*"
-        echo "* After the mirror operation completes, running"
+        echo "* You will recieve a message on this console when the mirror"
+        echo "* operation is complete. Once complete, 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/
+        ln -sf `find $ARCHIVE_MIRROR/mirror/ppa.launchpad.net/ -maxdepth 1 -mindepth 1 -type d` /var/www/html/
         [ -e $ARCHIVE_MIRROR/mirror/maas.ubuntu.com ] && ln -sf $ARCHIVE_MIRROR/mirror/maas.ubuntu.com /var/www/html/
-        chown -R www-data:www-data $ARCHIVE_MIRROR/mirror/*
         MIRRORED=1
         echo "*"
         get_yn "* Set up cron to keep your mirror up-to-date (NOTE: this only works if your MAAS server has internet access)" "Y"