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

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index cea4281e2..ea1b9202d 100644
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,4 +1,4 @@
-define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
+define site::aptrepo ($key = undef, $keyid = undef, $content = '', $source = '', $ensure = present) {
 
 	case $ensure {
 		present: {
@@ -31,7 +31,7 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 				}
 			} elsif $keyid {
 				exec { "apt-key-del-${keyid}":
-					command => "apt-key del ${keyid}",
+					command     => "apt-key del ${keyid}",
 				}
 			}
 		}
@@ -39,18 +39,15 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
 	}
 
 	if $ensure == present {
-		if ! ($config or $template) {
+		if ! ($source or $content) {
 			fail ( "No configuration found for ${name}" )
 		}
-		if ($config and $template) {
-			fail ( "Can't specify both config and template for ${name}" )
-		}
 	}
 
 	file { "/etc/apt/sources.list.d/${name}.list":
 		ensure  => $ensure,
-		content => template($template),
-		source  => $config,
+		content => $content,
+		source  => $source,
 		notify  => Exec['apt-get update'],
 	}
 }