more messing about

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/apache2/manifests/site.pp b/modules/apache2/manifests/site.pp
index 34292384e7f83579a774fe3479d7a71025bf981c..263c6d8a692a82327ca864fd52f11a681e6c32f2 100644 (file)
--- a/modules/apache2/manifests/site.pp
+++ b/modules/apache2/manifests/site.pp
@@ -1,6 +1,6 @@
 define apache2::site (
        $config = undef,
-       $template = undef,
+       $template = false,
        $ensure = present,
        $site = undef
 ) {
@@ -25,19 +25,22 @@ define apache2::site (
                default => err ( "Unknown ensure value: '$ensure'" ),
        }
 
-       if $template {
-               file { $target:
-                       ensure  => $ensure,
-                       content => template($template),
-                       require => Package['apache2'],
-                       notify  => Service['apache2'],
+       case $template {
+               false: {
+                       file { $target:
+                               ensure  => $ensure,
+                               source  => $config,
+                               require => Package['apache2'],
+                               notify  => Service['apache2'],
+                       }
                }
-       } else {
-               file { $target:
-                       ensure  => $ensure,
-                       source  => $config,
-                       require => Package['apache2'],
-                       notify  => Service['apache2'],
+               default: {
+                       file { $target:
+                               ensure  => $ensure,
+                               content => template($template),
+                               require => Package['apache2'],
+                               notify  => Service['apache2'],
+                       }
                }
        }