Movind zzz-erro to zzz-error on websites

diff --git a/manifests/websites.pp b/manifests/websites.pp
index adfd11e436164cf907754d58617e51d6d02344fd..93dd609c9ba239195e580e8f53e98635ea804f81 100644 (file)
--- 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"],
   }
 }