Switch to /etc/apt/trusted.gpg.d

[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 e19be7f83d1310c9ca75a1d10c062288551ad384..4417bfd5785b953106aea900d4e0d5b202a26c22 100644 (file)
--- 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,