aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-03-06 14:11:40 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-03-06 14:11:40 -0300
commitbf99feb90d736e98bbb3f812f80ec482d01ba58b (patch)
tree76893f204282c29a4ac4187ae05213f5a1e0fcdd /manifests
parentbe6914cef2766b700757845e468ad2415a92eb76 (diff)
downloadpuppet-nodo-bf99feb90d736e98bbb3f812f80ec482d01ba58b.tar.gz
puppet-nodo-bf99feb90d736e98bbb3f812f80ec482d01ba58b.tar.bz2
Movind zzz-erro to zzz-error on websites
Diffstat (limited to 'manifests')
-rw-r--r--manifests/websites.pp30
1 files changed, 27 insertions, 3 deletions
diff --git a/manifests/websites.pp b/manifests/websites.pp
index adfd11e..93dd609 100644
--- a/manifests/websites.pp
+++ b/manifests/websites.pp
@@ -56,26 +56,50 @@ class websites::setup {
docroot => "${apache_www_folder}",
}
+ # We have to use 'zzz-error' so it will be the last matched vhost
+ apache::site { "error":
+ source => true,
+ docroot => '/var/www/error',
+ filename => 'zzz-error',
+ }
+
+ # Index page for error
+ file { "/var/www/error/index.html":
+ ensure => "${apache_www_folder}/index.html",
+ owner => "root",
+ group => "root",
+ force => true,
+ require => File["/var/www/error"],
+ }
+
+ # TODO: this is temporary: remove when all nodes have applied it
# We have to use 'zzz-erro' so it will be the last matched vhost
apache::site { "erro":
+ ensure => absent,
source => true,
docroot => '/var/www/erro',
filename => 'zzz-erro',
}
+ # TODO: this is temporary: remove when all nodes have applied it
+ file { "/var/www/erro":
+ ensure => absent,
+ recurse => true,
+ force => true,
+ }
+
+ # TODO: this is temporary: remove when all nodes have applied it
# Index page for erro
file { "/var/www/erro/index.html":
- ensure => "${apache_www_folder}/index.html",
+ ensure => absent,
owner => "root",
group => "root",
force => true,
- require => File["/var/www/erro"],
}
# TODO: this is temporary: remove when all nodes have applied it
file { "/var/www/erro/missing.html":
ensure => absent,
- require => File["/var/www/erro"],
}
}