Changed APT setup.

3.New_server_deployment/3.Initialize_APT/0_setup.sh

@@ -23,21 +23,6 @@ if [ "${PROXY}" = "1" ]; then
 	fi
 fi
 
-# APT https support
-apt-get update
-apt-get install -y apt-transport-https
-
-# APT panel
-if ( ! test -z ${SKYREACH_API_KEY} ); then
-	echo "Adding skyreach.list to APT sources."
-	wget -q "https://${SKYREACH_HOST}/media/public.gpg" -O- | sudo apt-key add -
-	echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_API_KEY}/" > /etc/apt/sources.list.d/skyreach.list
-fi
-
-# update
-apt-get update
-apt-get dist-upgrade -y
-
 # migrate to Ubuntu 16.04 / apply sources.list
 if ( rgrep '14.04' /etc/lsb-release >/dev/null ); then
 	echo "Upgrading to Ubuntu 16.04."
@@ -53,6 +38,20 @@ else
 	apt-get dist-upgrade -y
 fi
 
+# APT https support
+apt-get install -y apt-transport-https
+
+# APT panel
+if ( ! test -z ${SKYREACH_API_KEY} ); then
+	echo "Adding skyreach.list to APT sources."
+	wget -q "https://${SKYREACH_HOST}/media/public.gpg" -O- | sudo apt-key add -
+	echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_API_KEY}/" > /etc/apt/sources.list.d/skyreach.list
+fi
+
+# update
+apt-get update
+apt-get dist-upgrade -y
+
 # unattended-upgrades
 echo "Installing and configuring unattended-upgrades."
 apt-get install -y unattended-upgrades