X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=59a3062814acb03aace063bec44b0abf00932ef3;hb=2bd5f8fb83aa8ed85616ec6565bba4a8a595fe1d;hp=9ede7f1e344e8abbf7fa18be9689bea4dc87fdb5;hpb=703267e5917d754360eb3530df6002eebcc2c140;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 9ede7f1e3..59a306281 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -101,7 +101,7 @@ class debian-org { file { '/etc/apt/trusted-keys.d': ensure => absent, - force => yes, + force => true, } file { '/etc/apt/trusted.gpg': @@ -114,6 +114,17 @@ class debian-org { suite => "${::lsbdistcodename}/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 { 'backports.debian.org': url => $mirror_backports,