X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fsite%2Fmanifests%2Faptrepo.pp;h=ae66d6f216b374dbbba7f006e4557d726ea5e334;hb=97b80c63870174dd9ca6e92b04da0f110a8150b3;hp=ea1b9202da1e3d07a4c0d33cfe36e47af1647142;hpb=5f7e9b2a528a64883641f38558c028ae4b1967f0;p=dsa-puppet.git

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index ea1b9202..ae66d6f2 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,4 +1,5 @@
-define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '', $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
+
 
 	case $ensure {
 		present: {
@@ -39,15 +40,22 @@ define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '',
 	}
 
 	if $ensure == present {
-		if ! ($source or $content) {
+		if ! ($config or $template) {
 			fail ( "No configuration found for ${name}" )
 		}
 	}
 
-	file { "/etc/apt/sources.list.d/${name}.list":
-		ensure  => $ensure,
-		content => $content,
-		source  => $source,
-		notify  => Exec['apt-get update'],
+	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'],
+		}
 	}
 }