X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=e53de75cd23b3b8c547a219e26d04db6584ebc37;hb=16e295d6dcd715d959e2fad2cf0e25ba2938058e;hp=ea1b9202da1e3d07a4c0d33cfe36e47af1647142;hpb=5f7e9b2a528a64883641f38558c028ae4b1967f0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index ea1b9202d..e53de75cd 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,4 +1,11 @@
-define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '', $ensure = present) {
+define site::aptrepo (
+	$url='',
+	$suite='',
+	$components=[],
+	$key = undef,
+	$keyid = undef,
+	$ensure = present
+) {
 
 	case $ensure {
 		present: {
@@ -38,16 +45,18 @@ define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '',
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
-	if $ensure == present {
-		if ! ($source or $content) {
-			fail ( "No configuration found for ${name}" )
+	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 => $content,
-		source  => $source,
+		content => template('site/aptrepo.erb'),
 		notify  => Exec['apt-get update'],
 	}
 }