X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=148f9cf0b8a5862e46cba42307fc039518382545;hb=6adb6a4953c88373e100c761ae8ed471b18fb6d3;hp=c97fade0ea3f6660273676bf628de545a750b186;hpb=9573712862a431d238cf67894f4b422794eaa78f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index c97fade0e..148f9cf0b 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,53 +1,42 @@
 define site::aptrepo (
-	$url,
-	$suite,
+	$url='',
+	$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'" ) }
 	}
 
+	case $ensure {
+		present: {
+			if !($url and $suite) {
+				fail ( "Need both url and suite for $name" )
+			}
+		}
+		default: {}
+	}
+
 	file { "/etc/apt/sources.list.d/${name}.list":
-			ensure  => $ensure,
-			content => template('site/aptrepo.erb'),
-			notify => Exec['apt-get update'],
+		ensure  => $ensure,
+		content => template('site/aptrepo.erb'),
+		notify  => Exec['apt-get update'],
 	}
 }