morgue from lw03

[mirror/dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 9ede7f1..59a3062 100644 (file)
--- 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,