X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=ae66d6f216b374dbbba7f006e4557d726ea5e334;hb=a212c6563eca103b65f5d999a70ed05d5f2231cc;hp=b1c825dcc638d8edf8a817ceb0f5e396d0198dc5;hpb=e75290ccf8c00441da366534d3d0e50381f7ef72;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index b1c825dcc..ae66d6f21 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,26 +1,48 @@
-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}",
-			refreshonly => true,
-		}
-
-		file { "/etc/apt/trusted-keys.d/${name}":
-			source => $key,
-			mode   => '0664',
-			notify => Exec["apt-key-update-${name}"]
-		}
-	}
 
 	case $ensure {
-		present: {}
-		absent:  {}
-		default: { err ( "Unknown ensure value: '$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}"]
+				}
+			}
+		}
+		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'" ) }
 	}
 
-	if ! ($template or $config) {
-		err ( "Can't find configuration for ${name}" )
+	if $ensure == present {
+		if ! ($config or $template) {
+			fail ( "No configuration found for ${name}" )
+		}
 	}
 
 	if $template {