From 611db589706d4a725081183e4ddcc0a9bcb0713a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 4 Nov 2016 13:01:22 +0100
Subject: [PATCH] Do not add skyreach repository if no API key is set.
---
21.Initialize_configuration_file/0_setup.sh | 16 +++++++++-------
23.Initialize_APT/0_setup.sh | 18 +++++++++++-------
default-conf.sh | 2 +-
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/21.Initialize_configuration_file/0_setup.sh b/21.Initialize_configuration_file/0_setup.sh
index f7c32608..3c56e495 100755
--- a/21.Initialize_configuration_file/0_setup.sh
+++ b/21.Initialize_configuration_file/0_setup.sh
@@ -2,13 +2,15 @@
source /root/envsetup/conf.sh
# Download config file from skyreach
-conf_url="https://$SKYREACH_HOST/erp/credentials/$SKYREACH_API_KEY/conf.sh"
-if ( curl -I "$conf_url" >/dev/null ); then
- wget -q "$conf_url" -O /root/envsetup/conf.sh
- source /root/envsetup/conf.sh
-else
- echo "Failed to download configuration using url:"
- echo " $conf_url"
+if ( ! test -z ${SKYREACH_API_KEY} ); then
+ conf_url="https://$SKYREACH_HOST/erp/credentials/$SKYREACH_API_KEY/conf.sh"
+ if ( curl -I "$conf_url" >/dev/null ); then
+ wget -q "$conf_url" -O /root/envsetup/conf.sh
+ source /root/envsetup/conf.sh
+ else
+ echo "Failed to download configuration using url:"
+ echo " $conf_url"
+ fi
fi
# Autogenerate missing values
diff --git a/23.Initialize_APT/0_setup.sh b/23.Initialize_APT/0_setup.sh
index 4aa2784e..76b973a0 100755
--- a/23.Initialize_APT/0_setup.sh
+++ b/23.Initialize_APT/0_setup.sh
@@ -22,16 +22,20 @@ apt-get install -y aptitude apt-transport-https
#apt-get dist-upgrade -y
# modify sources.list to use ubicast cache
-if ( ! grep "${APT_CACHE_HOST}" /etc/apt/sources.list >/dev/null ); then
- echo "Updating sources.list to use cache ${APT_CACHE_HOST}."
- sed -i "s@http://@http://${APT_CACHE_HOST}/@" /etc/apt/sources.list
+if ( ! test -z ${APT_CACHE_HOST} ); then
+ if ( ! grep "${APT_CACHE_HOST}" /etc/apt/sources.list >/dev/null ); then
+ echo "Updating sources.list to use cache ${APT_CACHE_HOST}."
+ sed -i "s@http://@http://${APT_CACHE_HOST}/@" /etc/apt/sources.list
+ fi
fi
# APT panel
-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
-apt-get update
+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
+ apt-get update
+fi
# unattended-upgrades
echo "Installing and configuring unattended-upgrades."
diff --git a/default-conf.sh b/default-conf.sh
index aacfadfe..a247a6e6 100644
--- a/default-conf.sh
+++ b/default-conf.sh
@@ -12,7 +12,7 @@ NC='\033[0m'
# -- System --
# Skyreach in which system looks for packages
SKYREACH_HOST='panel.ubicast.eu'
-SKYREACH_API_KEY='sde6b2af8d9feb2153d82e8183aa26a5'
+SKYREACH_API_KEY=
# NTP
NTP_SERVER1='ntp.ubuntu.com'
NTP_SERVER2=
--
GitLab