X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=f441ac51f6f00faf2e234bba5872afa107288252;hb=2d2d25eb5b5c376c5f73551fa11f5acaf866a60d;hp=f00592857a0e8419d3685990b71325ea1f26e385;hpb=b5643329942ff7a0236c3da65725fb50f2ad21d8;p=dsa-puppet.git diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index f0059285..f441ac51 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -8,7 +8,7 @@ class debian-org { } else { $mirror = 'http://http.debian.net/debian/' } - if $::lsbmajdistrelease < 7 { + if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 { $mirror_backports = 'http://backports.debian.org/debian-backports/' } else { $mirror_backports = $mirror @@ -60,7 +60,7 @@ class debian-org { ensure => installed, } - if $::lsbmajdistrelease >= 7 { + if $::lsbmajdistrelease == "testing" or $::lsbmajdistrelease >= 7 { package { 'libfilesystem-ruby1.9.1': ensure => installed, } @@ -122,7 +122,7 @@ class debian-org { suite => "${::lsbdistcodename}/updates", components => ['main','contrib','non-free'] } - if $::lsbmajdistrelease < 7 { + if $::lsbmajdistrelease != "testing" and $::lsbmajdistrelease < 7 { site::aptrepo { 'debian-lts': url => $mirror, suite => "${::lsbdistcodename}-lts",