diff options
author | Jérôme Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2016-06-29 21:49:21 +0200 |
---|---|---|
committer | Jérôme Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2016-06-29 21:49:21 +0200 |
commit | 98b4be5570064e8f6a962b11a3f48dc7834241a6 (patch) | |
tree | 6794aa7980d23a7863f53552e046c04c2a3e40ad /manifests/init.pp | |
parent | 5fd6c96c4202b27dd3cea335a1bebdf7b7e717ee (diff) |
Drop Debian lenny and squeeze support.
Diffstat (limited to 'manifests/init.pp')
-rw-r--r-- | manifests/init.pp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 46e5cb0..2ee4d10 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -11,7 +11,6 @@ class apt( $use_next_release = $apt::params::use_next_release, $debian_url = $apt::params::debian_url, $security_url = $apt::params::security_url, - $backports_url = $apt::params::backports_url, $lts_url = $apt::params::lts_url, $volatile_url = $apt::params::volatile_url, $ubuntu_url = $apt::params::ubuntu_url, @@ -21,11 +20,6 @@ class apt( $custom_key_dir = $apt::params::custom_key_dir ) inherits apt::params { - $real_backports_url = $backports_url ? { - false => $debian_url, - default => $backports_url, - } - package { 'apt': ensure => installed, require => undef, @@ -84,18 +78,15 @@ class apt( ## This package should really always be current package { 'debian-archive-keyring': ensure => latest } - # backports uses the normal archive key now - package { 'debian-backports-keyring': ensure => absent } - if ($use_backports and !($::debian_release in ['testing', 'unstable', 'experimental'])) { apt::sources_list { 'backports': - content => "deb ${real_backports_url} ${::debian_codename}-backports ${apt::repos}", + content => "deb ${debian_url} ${::debian_codename}-backports ${apt::repos}", } if $include_src { apt::sources_list { 'backports-src': - content => "deb-src ${real_backports_url} ${::debian_codename}-backports ${apt::repos}", + content => "deb-src ${debian_url} ${::debian_codename}-backports ${apt::repos}", } } } |