]> gitweb.fluxo.info Git - puppet-apache.git/commitdiff
Adding back source parameter
authorSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Dec 2009 21:29:53 +0000 (19:29 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Sat, 26 Dec 2009 21:29:53 +0000 (19:29 -0200)
manifests/init.pp

index a09b6ade83704b981b6537940b4d093ab04fb3dc..2167bbbac880411b72cb60a8d40647c8ccd5b047 100644 (file)
@@ -87,19 +87,19 @@ class apache {
               $server_alias = false, $use = false, $ticket = false,
               $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: {
+    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'),
@@ -109,8 +109,8 @@ class apache {
                  require => File["${apache2_macros}"],
                  notify  => Service["apache"],
                }
-  #           }
-  #  }
+             }
+    }
 
     $status = $ensure ? {
       'present' => "${apache2_sites}-available/$title",