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

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index ae66d6f21..e53de75cd 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,5 +1,11 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
-
+define site::aptrepo (
+	$url='',
+	$suite='',
+	$components=[],
+	$key = undef,
+	$keyid = undef,
+	$ensure = present
+) {
 
 	case $ensure {
 		present: {
@@ -39,23 +45,18 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 		default: { fail ( "Unknown ensure value: '$ensure'" ) }
 	}
 
-	if $ensure == present {
-		if ! ($config or $template) {
-			fail ( "No configuration found for ${name}" )
+	case $ensure {
+		present: {
+			if !($url and $suite) {
+				fail ( "Need both url and suite for $name" )
+			}
 		}
+		default: {}
 	}
 
-	if $template {
-		file { "/etc/apt/sources.list.d/${name}.list":
-			ensure  => $ensure,
-			content => template($template),
-			notify => Exec['apt-get update'],
-		}
-	} else {
-		file { "/etc/apt/sources.list.d/${name}.list":
-			ensure => $ensure,
-			source => $config,
-			notify => Exec['apt-get update'],
-		}
+	file { "/etc/apt/sources.list.d/${name}.list":
+		ensure  => $ensure,
+		content => template('site/aptrepo.erb'),
+		notify  => Exec['apt-get update'],
 	}
 }