From ee622108a5a463643f867188cfb39e98639c1fc3 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 17 Aug 2018 07:00:34 -0500 Subject: [PATCH] Remove restricted and multiverse from ubuntu servers restricted is supported software that is non-free. multiverse is unsupported software that is non-free. Use of software from either would be unacceptable on any Infra server, so remove them from the sources.list files. While we're in there, clean things up a little bit and add an arm file for bionic. Change-Id: I55a3b3d411e8a3496a4e6910baaf72f3c192e9d4 --- .../files/sources.list.bionic.aarch64 | 8 ++++ .../files/sources.list.bionic.x86_64 | 11 ++--- .../files/sources.list.trusty.x86_64 | 11 ++--- .../files/sources.list.xenial.aarch64 | 41 ++++--------------- .../files/sources.list.xenial.x86_64 | 14 ++----- 5 files changed, 27 insertions(+), 58 deletions(-) create mode 100644 playbooks/roles/base-repos/files/sources.list.bionic.aarch64 diff --git a/playbooks/roles/base-repos/files/sources.list.bionic.aarch64 b/playbooks/roles/base-repos/files/sources.list.bionic.aarch64 new file mode 100644 index 0000000000..30a09d23b3 --- /dev/null +++ b/playbooks/roles/base-repos/files/sources.list.bionic.aarch64 @@ -0,0 +1,8 @@ +# This file is kept updated by ansible, adapted from +# https://help.ubuntu.com/lts/serverguide/configuration.html +# Note the use of ports.ubuntu.com. + +deb http://ports.ubuntu.com/ubuntu-ports/ bionic main universe +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-updates main universe +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-backports main universe +deb http://ports.ubuntu.com/ubuntu-ports/ bionic-security main universe diff --git a/playbooks/roles/base-repos/files/sources.list.bionic.x86_64 b/playbooks/roles/base-repos/files/sources.list.bionic.x86_64 index 3372ec5bdb..37969b764e 100644 --- a/playbooks/roles/base-repos/files/sources.list.bionic.x86_64 +++ b/playbooks/roles/base-repos/files/sources.list.bionic.x86_64 @@ -1,10 +1,7 @@ # This file is kept updated by ansible, adapted from # https://help.ubuntu.com/lts/serverguide/configuration.html -deb http://us.archive.ubuntu.com/ubuntu bionic main restricted -deb http://us.archive.ubuntu.com/ubuntu bionic-updates main restricted -deb http://us.archive.ubuntu.com/ubuntu bionic universe -deb http://us.archive.ubuntu.com/ubuntu bionic-updates universe -deb http://us.archive.ubuntu.com/ubuntu bionic-backports main restricted universe -deb http://security.ubuntu.com/ubuntu bionic-security main restricted -deb http://security.ubuntu.com/ubuntu bionic-security universe +deb http://us.archive.ubuntu.com/ubuntu bionic main universe +deb http://us.archive.ubuntu.com/ubuntu bionic-updates main universe +deb http://us.archive.ubuntu.com/ubuntu bionic-backports main universe +deb http://security.ubuntu.com/ubuntu bionic-security main universe diff --git a/playbooks/roles/base-repos/files/sources.list.trusty.x86_64 b/playbooks/roles/base-repos/files/sources.list.trusty.x86_64 index 4a4b94516d..564fe789e9 100644 --- a/playbooks/roles/base-repos/files/sources.list.trusty.x86_64 +++ b/playbooks/roles/base-repos/files/sources.list.trusty.x86_64 @@ -1,13 +1,10 @@ # This file is kept updated by ansible, adapted from # http://ubuntuguide.org/wiki/Ubuntu_Trusty_Packages_and_Repositories -deb http://us.archive.ubuntu.com/ubuntu trusty main restricted -deb http://us.archive.ubuntu.com/ubuntu trusty-updates main restricted +deb http://us.archive.ubuntu.com/ubuntu trusty main +deb http://us.archive.ubuntu.com/ubuntu trusty-updates main deb http://us.archive.ubuntu.com/ubuntu trusty universe deb http://us.archive.ubuntu.com/ubuntu trusty-updates universe -deb http://us.archive.ubuntu.com/ubuntu trusty multiverse -deb http://us.archive.ubuntu.com/ubuntu trusty-updates multiverse -deb http://us.archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse -deb http://security.ubuntu.com/ubuntu trusty-security main restricted +deb http://us.archive.ubuntu.com/ubuntu trusty-backports main universe +deb http://security.ubuntu.com/ubuntu trusty-security main deb http://security.ubuntu.com/ubuntu trusty-security universe -deb http://security.ubuntu.com/ubuntu trusty-security multiverse diff --git a/playbooks/roles/base-repos/files/sources.list.xenial.aarch64 b/playbooks/roles/base-repos/files/sources.list.xenial.aarch64 index 3c089f33f6..b7322cb470 100644 --- a/playbooks/roles/base-repos/files/sources.list.xenial.aarch64 +++ b/playbooks/roles/base-repos/files/sources.list.xenial.aarch64 @@ -1,35 +1,8 @@ -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to -# newer versions of the distribution. +# This file is kept updated by ansible, adapted from +# https://help.ubuntu.com/lts/serverguide/configuration.html +# Note the use of ports.ubuntu.com. -deb http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial main restricted multiverse - -## Major bug fix updates produced after the final release of the -## distribution. -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main restricted multiverse - -## Uncomment the following two lines to add software from the 'universe' -## repository. -## 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://ports.ubuntu.com/ubuntu-ports/ xenial universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial universe -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-updates universe - -## 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://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted -# deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main restricted - -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security universe -# deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security multiverse -# deb-src http://ports.ubuntu.com/ubuntu-ports/ xenial-security multiverse \ No newline at end of file +deb http://ports.ubuntu.com/ubuntu-ports/ xenial main universe +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-updates main universe +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-backports main universe +deb http://ports.ubuntu.com/ubuntu-ports/ xenial-security main universe diff --git a/playbooks/roles/base-repos/files/sources.list.xenial.x86_64 b/playbooks/roles/base-repos/files/sources.list.xenial.x86_64 index 89e89230ad..290e05fc9a 100644 --- a/playbooks/roles/base-repos/files/sources.list.xenial.x86_64 +++ b/playbooks/roles/base-repos/files/sources.list.xenial.x86_64 @@ -1,13 +1,7 @@ # This file is kept updated by ansible, adapted from # https://help.ubuntu.com/lts/serverguide/configuration.html -deb http://us.archive.ubuntu.com/ubuntu xenial main restricted -deb http://us.archive.ubuntu.com/ubuntu xenial-updates main restricted -deb http://us.archive.ubuntu.com/ubuntu xenial universe -deb http://us.archive.ubuntu.com/ubuntu xenial-updates universe -deb http://us.archive.ubuntu.com/ubuntu xenial multiverse -deb http://us.archive.ubuntu.com/ubuntu xenial-updates multiverse -deb http://us.archive.ubuntu.com/ubuntu xenial-backports main restricted universe multiverse -deb http://security.ubuntu.com/ubuntu xenial-security main restricted -deb http://security.ubuntu.com/ubuntu xenial-security universe -deb http://security.ubuntu.com/ubuntu xenial-security multiverse +deb http://us.archive.ubuntu.com/ubuntu xenial main universe +deb http://us.archive.ubuntu.com/ubuntu xenial-updates main universe +deb http://us.archive.ubuntu.com/ubuntu xenial-backports main universe +deb http://security.ubuntu.com/ubuntu xenial-security main universe