simplify site::aptrepo

[dsa-puppet.git] / modules / site / manifests / aptrepo.pp

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index ae66d6f216b374dbbba7f006e4557d726ea5e334..ea1b9202da1e3d07a4c0d33cfe36e47af1647142 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,5 +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: {
@@ -40,22 +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 $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 => $content,
+               source  => $source,
+               notify  => Exec['apt-get update'],
        }
 }