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

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,

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index e53de75cd23b3b8c547a219e26d04db6584ebc37..148f9cf0b8a5862e46cba42307fc039518382545 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -3,43 +3,23 @@ define site::aptrepo (
        $suite='',
        $components=[],
        $key = undef,
-       $keyid = undef,
        $ensure = present
 ) {
 
        case $ensure {
                present: {
                        if $key {
-                               exec { "apt-key-update-${name}":
-                                       command     => "apt-key add /etc/apt/trusted-keys.d/${name}.asc",
-                                       refreshonly => true,
-                               }
-
-                               file { "/etc/apt/trusted-keys.d/${name}.asc":
+                               file { "/etc/apt/trusted.gpg.d/${name}.gpg":
                                        source => $key,
                                        mode   => '0664',
-                                       notify => Exec["apt-key-update-${name}"]
                                }
                        }
                }
                absent:  {
-                       if ($keyid) and ($key) {
-                               file { "/etc/apt/trusted-keys.d/${name}.asc":
-                                       ensure => absent,
-                                       notify => Exec["apt-key-del-${keyid}"]
-                               }
-                               exec { "apt-key-del-${keyid}":
-                                       command     => "apt-key del ${keyid}",
-                                       refreshonly => true,
-                               }
-                       } elsif $key {
-                               file { "/etc/apt/trusted-keys.d/${name}.asc":
+                       if $key {
+                               file { "/etc/apt/trusted.gpg.d/${name}.gpg":
                                        ensure => absent,
                                }
-                       } elsif $keyid {
-                               exec { "apt-key-del-${keyid}":
-                                       command     => "apt-key del ${keyid}",
-                               }
                        }
                }
                default: { fail ( "Unknown ensure value: '$ensure'" ) }