Revert "this is supposed to work" - it seems it doesn't

This reverts commit 3ae1d19e3d1e64321475bceed121a37522dd8226.

diff --git a/modules/site/manifests/aptrepo.pp b/modules/site/manifests/aptrepo.pp
index cea4281e21c81019d1205250c41f9bca3470c8c1..ae66d6f216b374dbbba7f006e4557d726ea5e334 100644 (file)
--- a/modules/site/manifests/aptrepo.pp
+++ b/modules/site/manifests/aptrepo.pp
@@ -1,5 +1,6 @@
 define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config = undef, $ensure = present) {
 
+
        case $ensure {
                present: {
                        if $key {
@@ -31,7 +32,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}",
                                }
                        }
                }
@@ -42,15 +43,19 @@ define site::aptrepo ($key = undef, $keyid = undef, $template = undef, $config =
                if ! ($config or $template) {
                        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,
-               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'],
+               }
        }
 }