From 6e0291577e2c06e8c7c880d2d6bf372ab0592ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 14 Jun 2019 14:50:32 +0200
Subject: [PATCH] Added skyreach APT token
---
3.New_server_deployment/4.APT_upgrade/0_setup.sh | 4 ++--
global-conf.sh | 1 +
tests/test_ubicast_packages_access.py | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/3.New_server_deployment/4.APT_upgrade/0_setup.sh b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
index 5460a886..83b6f31b 100755
--- a/3.New_server_deployment/4.APT_upgrade/0_setup.sh
+++ b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
@@ -57,10 +57,10 @@ fi
systemctl unmask nginx || true
# APT panel
-if ( ! test -z ${SKYREACH_API_KEY} ); then
+if ( ! test -z ${SKYREACH_APT_TOKEN} ); 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
+ echo "deb https://${SKYREACH_HOST} packaging/apt/${SKYREACH_APT_TOKEN}/" > /etc/apt/sources.list.d/skyreach.list
fi
# update
diff --git a/global-conf.sh b/global-conf.sh
index 2a973f4d..26a5acec 100644
--- a/global-conf.sh
+++ b/global-conf.sh
@@ -11,6 +11,7 @@ ENVSETUP_BRANCH='stable'
SKYREACH_HOST='panel.ubicast.eu'
SKYREACH_SSL_VERIFY='1'
SKYREACH_API_KEY=
+SKYREACH_APT_TOKEN=
SKYREACH_ACTIVATION_KEY=
# NTP
NTP_SERVER='0.pool.ntp.org,1.pool.ntp.org,2.pool.ntp.org,3.pool.ntp.org'
diff --git a/tests/test_ubicast_packages_access.py b/tests/test_ubicast_packages_access.py
index 1881cb02..cfe1e4a5 100755
--- a/tests/test_ubicast_packages_access.py
+++ b/tests/test_ubicast_packages_access.py
@@ -49,7 +49,7 @@ if content:
if not url or not apt_token:
print('The file "%s" is not correct: skyreach url not found.' % apt_source)
sys.exit(1)
-print('SkyReach url is %s and API key is %s[...].' % (url, apt_token[:8]))
+print('SkyReach url is "%s" and APT token is "%s[...]".' % (url, apt_token[:8]))
# Test SkyReach responses
req = requests.get(url, verify=False)
--
GitLab