X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=59a3062814acb03aace063bec44b0abf00932ef3;hb=2bd5f8fb83aa8ed85616ec6565bba4a8a595fe1d;hp=4417bfd5785b953106aea900d4e0d5b202a26c22;hpb=c3ac7edbf4f5bab8820a046e6d5dbf89e11fda1f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 4417bfd57..59a306281 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -101,16 +101,30 @@ class debian-org {
 
 	file { '/etc/apt/trusted-keys.d':
 		ensure => absent,
+		force  => true,
 	}
-	file { '/etc/apt/trusted.gpg',
+
+	file { '/etc/apt/trusted.gpg':
 		mode    => '0600',
 		content => "",
 	}
+
 	site::aptrepo { 'security':
 		url        => 'http://security.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,
@@ -140,7 +154,7 @@ class debian-org {
 		url        => 'http://db.debian.org/debian-admin',
 		suite      => 'lenny',
 		components => 'main',
-		key        => 'puppet:///modules/debian-org/db.debian.org.asc',
+		key        => 'puppet:///modules/debian-org/db.debian.org.gpg',
 	}
 
 	augeas { 'inittab_replicate':
@@ -177,10 +191,6 @@ class debian-org {
 	file { '/etc/apt/preferences':
 		source => 'puppet:///modules/debian-org/apt.preferences',
 	}
-	file { '/etc/apt/trusted-keys.d/':
-		ensure => directory,
-		purge  => true,
-	}
 	file { '/etc/apt/apt.conf.d/local-compression':
 		source => 'puppet:///modules/debian-org/apt.conf.d/local-compression',
 	}