]> gitweb.fluxo.info Git - puppet-apache.git/commitdiff
Fixing conditional (2)
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Dec 2009 03:16:38 +0000 (01:16 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 25 Dec 2009 03:16:38 +0000 (01:16 -0200)
manifests/init.pp

index cf675569a1b35b9519389e76b7e3c37a994ad1c3..505a134aa321ac2f744bfbb27446a6f201ab90f7 100644 (file)
@@ -87,26 +87,28 @@ class apache {
               $server_alias = false, $use = false, $ticket = false,
               $source = false) {
 
-    if $source != false {
-      file { "${apache2_sites}-available/$title":
-        ensure  => $ensure,
-        source  => $source,
-        owner   => root,
-        group   => root,
-        mode    => 0644,
-        require => File["${apache2_macros}"],
-        notify  => Service["apache"],
-      }
-    } else {
-      file { "${apache2_sites}-available/$title":
-        ensure  => $ensure,
-        content => template('apache/site.erb'),
-        owner   => root,
-        group   => root,
-        mode    => 0644,
-        require => File["${apache2_macros}"],
-        notify  => Service["apache"],
+    case $source {
+      false: {
+               file { "${apache2_sites}-available/$title":
+                 ensure  => $ensure,
+                 source  => $source,
+                 owner   => root,
+                 group   => root,
+                 mode    => 0644,
+                 require => File["${apache2_macros}"],
+                 notify  => Service["apache"],
+               }
       }
+      default:
+             file { "${apache2_sites}-available/$title":
+               ensure  => $ensure,
+               content => template('apache/site.erb'),
+               owner   => root,
+               group   => root,
+               mode    => 0644,
+               require => File["${apache2_macros}"],
+               notify  => Service["apache"],
+             }
     }
 
     $status = $ensure ? {