X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=c97fade0ea3f6660273676bf628de545a750b186;hb=9573712862a431d238cf67894f4b422794eaa78f;hp=d5bae7812dd5b736b5640a8f0190a3f6cf1cb3d6;hpb=51a7173ff33621ad8f203107d559fc495c91e756;p=dsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index d5bae781..c97fade0 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,4 +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: {
@@ -38,23 +45,9 @@ 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}" )
-		}
-	}
-
-	if $template {
-		file { "/etc/apt/sources.list.d/${name}.list":
+	file { "/etc/apt/sources.list.d/${name}.list":
 			ensure  => $ensure,
-			content => template($template),
+			content => template('site/aptrepo.erb'),
 			notify => Exec['apt-get update'],
-		}
-	} else {
-		file { "/etc/apt/sources.list.d/${name}.list":
-			ensure => $ensure,
-			source => $config,
-			notify => Exec['apt-get update'],
-		}
 	}
 }