opendev/system-config
Code Issues Proposed changes

Remove restricted and multiverse

Browse Source 
The packages in restricted and multiverse are either non-free or
unsupported. While they're usually useful for desktop, they aren't
something that OpenStack should grow a dependency on.

Also remove non-free and contrib from debian. We don't do anything with
debian yet - but if we did, I'm pretty sure we would not want these.

Note: The existing restricted and multiverse dirs should be purged,
although it's not urgent to do so. 'reprepro --delete clearvanished'

Change-Id: I1d98ab1dea52598d01e3ce3d9a24306280a190fe
This commit is contained in:
Monty Taylor 2016-02-07 07:33:32 -06:00
parent 75abc5bc4b
commit 857b22519a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/files/reprepro/updates
View File

@ -1,6 +1,6 @@
Name: ubuntu
Method: http://us.archive.ubuntu.com/ubuntu
Components: main universe restricted multiverse
Components: main universe
UDebComponents: main
Architectures: amd64
GetInRelease: no
@ -8,7 +8,7 @@ VerifyRelease: 437D05B5
Name: ubuntu-security
Method: http://security.ubuntu.com/ubuntu
Components: main universe restricted multiverse
Components: main universe
UDebComponents: main
Architectures: amd64
GetInRelease: no
@ -16,7 +16,7 @@ VerifyRelease: 437D05B5
Name: debian
Method: http://ftp.us.debian.org/debian/
Components: main non-free contrib
Components: main
UDebComponents: main
Architectures: amd64
GetInRelease: no
@ -24,7 +24,7 @@ VerifyRelease: 2B90D010
Name: debian-security
Method: http://security.debian.org/
Components: main non-free contrib
Components: main
UDebComponents: main
Architectures: amd64
GetInRelease: no

12
modules/openstack_project/templates/reprepro/distributions.erb
View File

@ -3,7 +3,7 @@ Origin: Ubuntu
Codename: <%= release %>
Description: OpenStack Ubuntu <%= release.capitalize %> mirror
Architectures: amd64
Components: main universe restricted multiverse
Components: main universe
UDebComponents: main
Contents: .gz
Update: ubuntu
@ -13,7 +13,7 @@ Origin: Ubuntu
Codename: <%= release %>-updates
Description: OpenStack Ubuntu <%= release.capitalize %> Updates mirror
Architectures: amd64
Components: main universe restricted multiverse
Components: main universe
UDebComponents: main
Contents: .gz
Update: ubuntu
@ -23,7 +23,7 @@ Origin: Ubuntu
Codename: <%= release %>-backports
Description: OpenStack Ubuntu <%= release.capitalize %> Backports mirror
Architectures: amd64
Components: main universe restricted multiverse
Components: main universe
UDebComponents: main
Contents: .gz
Update: ubuntu
@ -33,7 +33,7 @@ Origin: Ubuntu
Codename: <%= release %>-security
Description: OpenStack Ubuntu <%= release.capitalize %> Security mirror
Architectures: amd64
Components: main universe restricted multiverse
Components: main universe
UDebComponents: main
Contents: .gz
Update: ubuntu-security
@ -45,7 +45,7 @@ Origin: Debian
Codename: <%= release %>
Description: OpenStack Debian <%= release.capitalize %> mirror
Architectures: amd64
Components: main non-free contrib
Components: main
UDebComponents: main
Contents: .gz
Update: debian
@ -55,7 +55,7 @@ Origin: Debian
Codename: <%= release %>-updates
Description: OpenStack Debian <%= release.capitalize %> Updates mirror
Architectures: amd64
Components: main non-free contrib
Components: main
UDebComponents: main
Contents: .gz
Update: debian