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

[dsa-puppet.git] / modules / site / manifests / aptrepo.pp

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'" ) }