X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=4417bfd5785b953106aea900d4e0d5b202a26c22;hb=c3ac7edbf4f5bab8820a046e6d5dbf89e11fda1f;hp=e19be7f83d1310c9ca75a1d10c062288551ad384;hpb=f6076148413e9ea0511b96242d535fa6acae9a07;p=dsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index e19be7f8..4417bfd5 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -99,6 +99,13 @@ class debian-org {
 		require => Package['molly-guard'],
 	}
 
+	file { '/etc/apt/trusted-keys.d':
+		ensure => absent,
+	}
+	file { '/etc/apt/trusted.gpg',
+		mode    => '0600',
+		content => "",
+	}
 	site::aptrepo { 'security':
 		url        => 'http://security.debian.org/',
 		suite      => "${::lsbdistcodename}/updates",
@@ -110,11 +117,6 @@ class debian-org {
 		suite      => "${::lsbdistcodename}-backports",
 		components => ['main','contrib','non-free']
 	}
-	site::aptrepo { 'backports.org':
-		ensure => absent,
-		keyid  => '16BA136C',
-		key    => 'puppet:///modules/debian-org/backports.org.asc',
-	}
 
 	site::aptrepo { 'volatile':
 		url        => $mirror,