From 480520236bd9a2a7e0f27b34e2f91534fb917c7e Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Wed, 2 Mar 2016 23:48:57 +0100 Subject: [PATCH] debian-org: squeeze cleanup Signed-off-by: Julien Cristau --- modules/debian-org/manifests/init.pp | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 6ac4c123a..55cb506c1 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -13,11 +13,6 @@ class debian-org { $mirror = 'http://deb.debian.org/debian/' } } - if $::lsbmajdistrelease < 7 { - $mirror_backports = 'http://backports.debian.org/debian-backports/' - } else { - $mirror_backports = $mirror - } if $::lsbmajdistrelease <= 7 { $mungedcodename = $::lsbdistcodename @@ -68,10 +63,8 @@ class debian-org { if ($::lsbmajdistrelease >= 8) { $rubyfs_package = 'ruby-filesystem' - } elsif $::lsbmajdistrelease == 7 { - $rubyfs_package = 'libfilesystem-ruby1.9' } else { - $rubyfs_package = 'libfilesystem-ruby1.8' + $rubyfs_package = 'libfilesystem-ruby1.9' } package { [ 'apt-utils', @@ -143,20 +136,12 @@ class debian-org { suite => "${mungedcodename}/updates", components => ['main','contrib','non-free'] } - if $::lsbmajdistrelease < 7 { - site::aptrepo { 'debian-lts': - url => $mirror, - suite => "${::lsbdistcodename}-lts", - components => ['main','contrib','non-free'] - } - } else { - site::aptrepo { 'debian-lts': - ensure => absent, - } + site::aptrepo { 'debian-lts': + ensure => absent, } site::aptrepo { 'backports.debian.org': - url => $mirror_backports, + url => $mirror, suite => "${::lsbdistcodename}-backports", components => ['main','contrib','non-free'] } -- 2.20.1