summaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2009-12-26 19:29:53 -0200
committerSilvio Rhatto <rhatto@riseup.net>2009-12-26 19:29:53 -0200
commitd99505aabfcc4058c7a997352d9a24a1934bb8b1 (patch)
treea4e3af03c072922e6fe728ad573d71a7742f6f43 /manifests
parent51792f6e4683c7609c798dd1039251354dead110 (diff)
downloadpuppet-apache-d99505aabfcc4058c7a997352d9a24a1934bb8b1.tar.gz
puppet-apache-d99505aabfcc4058c7a997352d9a24a1934bb8b1.tar.bz2
Adding back source parameter
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp30
1 files changed, 15 insertions, 15 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index a09b6ad..2167bbb 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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",