X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=ae66d6f216b374dbbba7f006e4557d726ea5e334;hb=e69713f7d490e43797ef83b604553b3bdd10cdff;hp=79d1a59c6cedee053832d7fa2dd8cb37fa0ff907;hpb=f1c7df7c131eedaea84597e7b4ee8d312e5e4105;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index 79d1a59c6..ae66d6f21 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,21 +1,41 @@
-define site::aptrepo ($key = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $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":
-			source => $key,
-			mode   => '0664',
-			notify => Exec["apt-key-update-${name}"]
-		}
-	}
 
 	case $ensure {
-		present: {}
-		absent:  {}
+		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":
+					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":
+					ensure => absent,
+				}
+			} elsif $keyid {
+				exec { "apt-key-del-${keyid}":
+					command     => "apt-key del ${keyid}",
+				}
+			}
+		}
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}