From 80e0cda57ccd44d0ec6a3525c26bd0efaa0c353f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 2 Feb 2017 15:36:31 +0100
Subject: [PATCH] Fixed APT setup.

---
 .../3.Initialize_APT/0_setup.sh               | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/3.New_server_deployment/3.Initialize_APT/0_setup.sh b/3.New_server_deployment/3.Initialize_APT/0_setup.sh
index 1365dfdf..42160d31 100755
--- a/3.New_server_deployment/3.Initialize_APT/0_setup.sh
+++ b/3.New_server_deployment/3.Initialize_APT/0_setup.sh
@@ -12,13 +12,6 @@ if ( ! test -z ${APT_CACHE_HOST} ); then
 	fi
 fi
 
-# 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
-
 # APT proxy
 if [ "${PROXY}" = "1" ]; then
 	if [ "${PROXY_AUTHENTICATION}" = "1" ]; then
@@ -30,9 +23,19 @@ if [ "${PROXY}" = "1" ]; then
 	fi
 fi
 
-# update
+# 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
-- 
GitLab