From f688815c6c6487da2f4301778ca9c243a4a51988 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Fri, 10 Feb 2017 11:08:41 +0100
Subject: [PATCH] Fixed APT cache url (refs #20417).
---
2.Common_services/5.Nginx/vhost_skyreach.conf | 2 +-
3.New_server_deployment/4.APT_upgrade/0_setup.sh | 8 ++++----
global-conf.sh | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/2.Common_services/5.Nginx/vhost_skyreach.conf b/2.Common_services/5.Nginx/vhost_skyreach.conf
index 26c85389..d2b31516 100644
--- a/2.Common_services/5.Nginx/vhost_skyreach.conf
+++ b/2.Common_services/5.Nginx/vhost_skyreach.conf
@@ -52,7 +52,7 @@ server {
}
# APT proxy
location /apt {
- location ~ ^/apt/(http|https)/([\w\.\-\_]+.ubuntu.com/ubuntu|panel.ubicast.eu/packaging/apt)/(.*)$ {
+ location ~ ^/apt/(http|https)/([\w\.\-\_]+.ubuntu.com/ubuntu|ftp.debian.org/debian|mozilla.debian.net|panel.ubicast.eu/packaging/apt)/(.*)$ {
resolver 127.0.0.1;
proxy_pass $1://$2/$3;
proxy_cache uc-apt-cache;
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 977382ab..aa0c157c 100755
--- a/3.New_server_deployment/4.APT_upgrade/0_setup.sh
+++ b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
@@ -15,10 +15,10 @@ if ( rgrep '14.04' /etc/lsb-release >/dev/null ); then
fi
# modify sources.list to use ubicast cache
-if ( ! test -z ${APT_CACHE_HOST} ); then
- if ( ! grep "${APT_CACHE_HOST}" /etc/apt/sources.list >/dev/null ); then
- echo "Updating /etc/apt/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_URL} ); then
+ if ( ! grep "${APT_CACHE_URL}" /etc/apt/sources.list >/dev/null ); then
+ echo "Updating /etc/apt/sources.list to use cache ${APT_CACHE_URL}."
+ sed -i "s@http://@${APT_CACHE_URL}@" /etc/apt/sources.list
fi
fi
diff --git a/global-conf.sh b/global-conf.sh
index 36fe5195..d54441d2 100644
--- a/global-conf.sh
+++ b/global-conf.sh
@@ -22,7 +22,7 @@ NTP_SERVER='ntp.ubuntu.com'
SSL_CERTIFICATE='/etc/ssl/certs/ssl-cert-snakeoil.pem'
SSL_CERTIFICATE_KEY='/etc/ssl/private/ssl-cert-snakeoil.key'
# APT sources
-APT_CACHE_HOST=
+APT_CACHE_URL=
# -- Shell --
# ubicast shell account
--
GitLab