From: Morgan Haskel Date: Sun, 15 Feb 2015 18:22:37 +0000 (-0800) Subject: Remove backports and debian X-Git-Tag: 2.0.0~45^2~11 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9debb1a909e27452c4704930b5b0026a73f0f142;p=puppet-modules%2Fpuppetlabs-apt.git Remove backports and debian --- diff --git a/manifests/backports.pp b/manifests/backports.pp deleted file mode 100644 index a3ddb76..0000000 --- a/manifests/backports.pp +++ /dev/null @@ -1,82 +0,0 @@ -# This adds the necessary components to get backports for ubuntu and debian -# -# == Parameters -# -# [*release*] -# The ubuntu/debian release name. Defaults to $lsbdistcodename. Setting this -# manually can cause undefined behavior. (Read: universe exploding) -# -# [*pin_priority*] -# _default_: 200 -# -# The priority that should be awarded by default to all packages coming from -# the Debian Backports project. -# -# == Examples -# -# include apt::backports -# -# class { 'apt::backports': -# release => 'natty', -# } -# -# == Authors -# -# Ben Hughes, I think. At least blame him if this goes wrong. -# I just added puppet doc. -# -# == Copyright -# -# Copyright 2011 Puppet Labs Inc, unless otherwise noted. -class apt::backports( - $release = $::lsbdistcodename, - $location = $::apt::params::backports_location, - $pin_priority = 200, -) inherits apt::params { - - if ! is_integer($pin_priority) { - fail('$pin_priority must be an integer') - } - - if $::lsbdistid == 'LinuxMint' { - if $::lsbdistcodename == 'debian' { - $distid = 'debian' - $release_real = 'wheezy' - } else { - $distid = 'ubuntu' - $release_real = $::lsbdistcodename ? { - 'qiana' => 'trusty', - 'petra' => 'saucy', - 'olivia' => 'raring', - 'nadia' => 'quantal', - 'maya' => 'precise', - } - } - } else { - $distid = $::lsbdistid - $release_real = downcase($release) - } - - $key = $distid ? { - 'debian' => '46925553', - 'ubuntu' => '437D05B5', - } - $repos = $distid ? { - 'debian' => 'main contrib non-free', - 'ubuntu' => 'main universe multiverse restricted', - } - - apt::pin { 'backports': - before => Apt::Source['backports'], - release => "${release_real}-backports", - priority => $pin_priority, - } - - apt::source { 'backports': - location => $location, - release => "${release_real}-backports", - repos => $repos, - key => $key, - key_server => 'pgp.mit.edu', - } -} diff --git a/manifests/debian/testing.pp b/manifests/debian/testing.pp deleted file mode 100644 index 3a82b4f..0000000 --- a/manifests/debian/testing.pp +++ /dev/null @@ -1,21 +0,0 @@ -# testing.pp - -class apt::debian::testing { - include apt - - # deb http://debian.mirror.iweb.ca/debian/ testing main contrib non-free - # deb-src http://debian.mirror.iweb.ca/debian/ testing main contrib non-free - # Key: 46925553 Server: subkeys.pgp.net - # debian-keyring - # debian-archive-keyring - - apt::source { 'debian_testing': - location => 'http://debian.mirror.iweb.ca/debian/', - release => 'testing', - repos => 'main contrib non-free', - required_packages => 'debian-keyring debian-archive-keyring', - key => '46925553', - key_server => 'subkeys.pgp.net', - pin => '-10', - } -} diff --git a/manifests/debian/unstable.pp b/manifests/debian/unstable.pp deleted file mode 100644 index 77df94b..0000000 --- a/manifests/debian/unstable.pp +++ /dev/null @@ -1,21 +0,0 @@ -# unstable.pp - -class apt::debian::unstable { - include apt - - # deb http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free - # deb-src http://debian.mirror.iweb.ca/debian/ unstable main contrib non-free - # Key: 46925553 Server: subkeys.pgp.net - # debian-keyring - # debian-archive-keyring - - apt::source { 'debian_unstable': - location => 'http://debian.mirror.iweb.ca/debian/', - release => 'unstable', - repos => 'main contrib non-free', - required_packages => 'debian-keyring debian-archive-keyring', - key => '46925553', - key_server => 'subkeys.pgp.net', - pin => '-10', - } -} diff --git a/manifests/params.pp b/manifests/params.pp index b97a8a2..ce8a6df 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -40,20 +40,17 @@ class apt::params { 'debian': { case $distcodename { 'squeeze': { - $backports_location = 'http://backports.debian.org/debian-backports' $legacy_origin = true $origins = ['${distro_id} oldstable', #lint:ignore:single_quote_string_with_variables '${distro_id} ${distro_codename}-security', #lint:ignore:single_quote_string_with_variables '${distro_id} ${distro_codename}-lts'] #lint:ignore:single_quote_string_with_variables } 'wheezy': { - $backports_location = 'http://ftp.debian.org/debian/' $legacy_origin = false $origins = ['origin=Debian,archive=stable,label=Debian-Security', 'origin=Debian,archive=oldstable,label=Debian-Security'] } default: { - $backports_location = 'http://http.debian.net/debian/' $legacy_origin = false $origins = ['origin=Debian,archive=stable,label=Debian-Security'] } @@ -62,19 +59,16 @@ class apt::params { 'ubuntu': { case $distcodename { 'lucid': { - $backports_location = 'http://us.archive.ubuntu.com/ubuntu' $ppa_options = undef $legacy_origin = true $origins = ['${distro_id} ${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables } 'precise', 'trusty', 'utopic', 'vivid': { - $backports_location = 'http://us.archive.ubuntu.com/ubuntu' $ppa_options = '-y' $legacy_origin = true $origins = ['${distro_id}:${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables } default: { - $backports_location = 'http://old-releases.ubuntu.com/ubuntu' $ppa_options = '-y' $legacy_origin = true $origins = ['${distro_id}:${distro_codename}-security'] #lint:ignore:single_quote_string_with_variables diff --git a/spec/classes/backports_spec.rb b/spec/classes/backports_spec.rb deleted file mode 100644 index 3c1f438..0000000 --- a/spec/classes/backports_spec.rb +++ /dev/null @@ -1,177 +0,0 @@ -require 'spec_helper' -describe 'apt::backports', :type => :class do - - describe 'when asigning a custom priority to backports' do - let :facts do - { - 'lsbdistcodename' => 'Karmic', - 'lsbdistid' => 'Ubuntu', - 'osfamily' => 'Debian' - } - end - - context 'integer priority' do - let :params do { :pin_priority => 500 } end - - it { should contain_apt__source('backports').with({ - 'location' => 'http://old-releases.ubuntu.com/ubuntu', - 'release' => 'karmic-backports', - 'repos' => 'main universe multiverse restricted', - 'key' => '437D05B5', - 'key_server' => 'pgp.mit.edu', - }) - } - - it { should contain_apt__pin('backports').with({ - 'release' => 'karmic-backports', - 'priority' => 500, - }) - } - end - - context 'invalid priority' do - let :params do { :pin_priority => 'banana' } end - it 'should fail' do - expect { subject }.to raise_error(/must be an integer/) - end - end - end - - describe 'when turning on backports for ubuntu karmic' do - - let :facts do - { - 'lsbdistcodename' => 'Karmic', - 'lsbdistid' => 'Ubuntu', - 'osfamily' => 'Debian' - } - end - - it { should contain_apt__source('backports').with({ - 'location' => 'http://old-releases.ubuntu.com/ubuntu', - 'release' => 'karmic-backports', - 'repos' => 'main universe multiverse restricted', - 'key' => '437D05B5', - 'key_server' => 'pgp.mit.edu', - }) - } - - it { should contain_apt__pin('backports').with({ - 'release' => 'karmic-backports', - 'priority' => 200, - }) - } - end - - describe "when turning on backports for debian squeeze" do - - let :facts do - { - 'lsbdistcodename' => 'Squeeze', - 'lsbdistid' => 'Debian', - 'osfamily' => 'Debian' - } - end - - it { should contain_apt__source('backports').with({ - 'location' => 'http://backports.debian.org/debian-backports', - 'release' => 'squeeze-backports', - 'repos' => 'main contrib non-free', - 'key' => '46925553', - 'key_server' => 'pgp.mit.edu', - }) - } - - it { should contain_apt__pin('backports').with({ - 'release' => 'squeeze-backports', - 'priority' => 200, - }) - } - end - - describe "when turning on backports for linux mint debian edition" do - - let :facts do - { - 'lsbdistcodename' => 'debian', - 'lsbdistid' => 'LinuxMint', - 'osfamily' => 'Debian' - } - end - - it { should contain_apt__source('backports').with({ - 'location' => 'http://ftp.debian.org/debian/', - 'release' => 'wheezy-backports', - 'repos' => 'main contrib non-free', - 'key' => '46925553', - 'key_server' => 'pgp.mit.edu', - }) - } - - it { should contain_apt__pin('backports').with({ - 'release' => 'wheezy-backports', - 'priority' => 200, - }) - } - end - - describe "when turning on backports for linux mint 17 (ubuntu-based)" do - - let :facts do - { - 'lsbdistcodename' => 'qiana', - 'lsbdistid' => 'LinuxMint', - 'osfamily' => 'Debian' - } - end - - it { should contain_apt__source('backports').with({ - 'location' => 'http://us.archive.ubuntu.com/ubuntu', - 'release' => 'trusty-backports', - 'repos' => 'main universe multiverse restricted', - 'key' => '437D05B5', - 'key_server' => 'pgp.mit.edu', - }) - } - - it { should contain_apt__pin('backports').with({ - 'release' => 'trusty-backports', - 'priority' => 200, - }) - } - end - - describe "when turning on backports for debian squeeze but using your own mirror" do - - let :facts do - { - 'lsbdistcodename' => 'Squeeze', - 'lsbdistid' => 'Debian', - 'osfamily' => 'Debian' - } - end - - let :location do - 'http://mirrors.example.com/debian-backports' - end - - let :params do - { 'location' => location } - end - - it { should contain_apt__source('backports').with({ - 'location' => location, - 'release' => 'squeeze-backports', - 'repos' => 'main contrib non-free', - 'key' => '46925553', - 'key_server' => 'pgp.mit.edu', - }) - } - - it { should contain_apt__pin('backports').with({ - 'release' => 'squeeze-backports', - 'priority' => 200, - }) - } - end -end