Add squeeze-lts

[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 840efc1f9e9f2378b50fb1ca87ef906f628f0d2f..838a4a288bdc6e22d268923049341feace8d79f3 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -101,6 +101,7 @@ class debian-org {
 
        file { '/etc/apt/trusted-keys.d':
                ensure => absent,
+               force  => true,
        }
 
        file { '/etc/apt/trusted.gpg':
@@ -113,6 +114,13 @@ 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']
+               }
+       }
 
        site::aptrepo { 'backports.debian.org':
                url        => $mirror_backports,
@@ -142,7 +150,7 @@ class debian-org {
                url        => 'http://db.debian.org/debian-admin',
                suite      => 'lenny',
                components => 'main',
-               key        => 'puppet:///modules/debian-org/db.debian.org.db',
+               key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
        }
 
        augeas { 'inittab_replicate':