]> gitweb.fluxo.info Git - puppet-apache.git/commitdiff
Using true/false for source
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Dec 2009 19:28:32 +0000 (17:28 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Dec 2009 19:28:32 +0000 (17:28 -0200)
manifests/init.pp

index 70f6cc229a6c11ec58e60f9ce8aeec94176dd1be..2167bbbac880411b72cb60a8d40647c8ccd5b047 100644 (file)
@@ -85,10 +85,21 @@ class apache {
   define site($ensure = present, $docroot = false, $redirect = false,
               $redirect_match = false, $protocol = 'http',
               $server_alias = false, $use = false, $ticket = false,
-              $source = '') {
+              $source = false) {
 
     case $source {
-      '': {
+      true: {
+                 file { "${apache2_sites}-available/$title":
+                   ensure  => $ensure,
+                   source  => "puppet://$server/files/apache/$name",
+                   owner   => root,
+                   group   => root,
+                   mode    => 0644,
+                   require => File["${apache2_macros}"],
+                   notify  => Service["apache"],
+                 }
+               }
+      false: {
                file { "${apache2_sites}-available/$title":
                  ensure  => $ensure,
                  content => template('apache/site.erb'),
@@ -99,17 +110,6 @@ class apache {
                  notify  => Service["apache"],
                }
              }
-      default: {
-                 file { "${apache2_sites}-available/$title":
-                   ensure  => $ensure,
-                   source  => $source,
-                   owner   => root,
-                   group   => root,
-                   mode    => 0644,
-                   require => File["${apache2_macros}"],
-                   notify  => Service["apache"],
-                 }
-               }
     }
 
     $status = $ensure ? {