aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-03-06 14:41:19 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-03-06 14:41:19 -0300
commitda08f2566ee450fbb51adb0382e18da8e7d25c44 (patch)
treec16ff5daf9c155275cca5b1a20729347f719befd
parentbf99feb90d736e98bbb3f812f80ec482d01ba58b (diff)
downloadpuppet-nodo-da08f2566ee450fbb51adb0382e18da8e7d25c44.tar.gz
puppet-nodo-da08f2566ee450fbb51adb0382e18da8e7d25c44.tar.bz2
Using template for error domain
-rw-r--r--manifests/websites.pp9
1 files changed, 5 insertions, 4 deletions
diff --git a/manifests/websites.pp b/manifests/websites.pp
index 93dd609..0374987 100644
--- a/manifests/websites.pp
+++ b/manifests/websites.pp
@@ -1,6 +1,7 @@
class websites::setup {
# Configure Apache Web Server
$apache_www_folder = "/var/www/data"
+ $apache_error_folder = "/var/www/error"
$apache_sites_folder = "/var/sites"
$apache_error_dest = "http://${domain}/missing.html"
$drupal_folder = "${apache_www_folder}/drupal"
@@ -58,18 +59,18 @@ class websites::setup {
# We have to use 'zzz-error' so it will be the last matched vhost
apache::site { "error":
- source => true,
- docroot => '/var/www/error',
+ template => 'apache/error.erb',
+ docroot => "${apache_error_folder}",
filename => 'zzz-error',
}
# Index page for error
- file { "/var/www/error/index.html":
+ file { "${apache_error_folder}/index.html":
ensure => "${apache_www_folder}/index.html",
owner => "root",
group => "root",
force => true,
- require => File["/var/www/error"],
+ require => File["$apache_error_folder"],
}
# TODO: this is temporary: remove when all nodes have applied it