From 8011862d3bc54abb795de782608777c1a215b9c5 Mon Sep 17 00:00:00 2001
From: Nicolas KAROLAK <nicolas@karolak.fr>
Date: Thu, 21 Jun 2018 14:30:31 +0200
Subject: [PATCH] 34: fix apt_cache_url sed & minimaze sources list
---
.../4.APT_upgrade/0_setup.sh | 2 +-
.../4.APT_upgrade/sources16.list | 53 ++-----------------
2 files changed, 5 insertions(+), 50 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 501706ce..4f18d381 100755
--- a/3.New_server_deployment/4.APT_upgrade/0_setup.sh
+++ b/3.New_server_deployment/4.APT_upgrade/0_setup.sh
@@ -26,7 +26,7 @@ fi
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
+ sed -i "s@http://@http://${APT_CACHE_URL}@" /etc/apt/sources.list
fi
fi
diff --git a/3.New_server_deployment/4.APT_upgrade/sources16.list b/3.New_server_deployment/4.APT_upgrade/sources16.list
index aaa9ba29..b967902f 100644
--- a/3.New_server_deployment/4.APT_upgrade/sources16.list
+++ b/3.New_server_deployment/4.APT_upgrade/sources16.list
@@ -1,49 +1,4 @@
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial main restricted
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial-updates main restricted
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates main restricted
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial universe
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial universe
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial-updates universe
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates universe
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial multiverse
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial multiverse
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-updates multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-deb http://fr.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
-# deb-src http://fr.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
-
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu xenial partner
-# deb-src http://archive.canonical.com/ubuntu xenial partner
-
-deb http://security.ubuntu.com/ubuntu xenial-security main restricted
-# deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted
-deb http://security.ubuntu.com/ubuntu xenial-security universe
-# deb-src http://security.ubuntu.com/ubuntu xenial-security universe
-deb http://security.ubuntu.com/ubuntu xenial-security multiverse
-# deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse
+deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse
+deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
+deb http://security.ubuntu.com/ubuntu xenial-security main restricted universe multiverse
\ No newline at end of file
--
GitLab