Using template for error domain

diff --git a/manifests/websites.pp b/manifests/websites.pp
index 93dd609c9ba239195e580e8f53e98635ea804f81..037498704402f3e7d262a2f6cbe73b6d46ccbeb2 100644 (file)
--- 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