Using virtual resources for all apache::site definitions

diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 21b924f16b68d75da2c83b349dd121198d8f32a8..01b34502f1e9bd2130265c47d8c84699910e1040 100644 (file)
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -66,18 +66,20 @@ class websites::setup {
   }
 
   # Default vhost: can just be applied on the defining host
-  apache::site { "$default_vhost":
+  @apache::site { "$default_vhost":
     server_alias => "$domain",
     docroot      => "${apache_www_folder}",
     mpm          => false,
+    tag          => 'all',
   }
 
   # We have to use 'zzz-error' so it will be the last matched vhost
-  apache::site { "error":
+  @apache::site { "error":
     template       => 'apache/error.erb',
     docroot        => "${apache_error_folder}",
     filename       => 'zzz-error',
     mpm            => false,
+    tag            => 'all',
   }
 
   # Index page for error
@@ -100,10 +102,11 @@ class websites::setup {
 
   # 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":
+  @apache::site { "erro":
     ensure         => absent,
     docroot        => '/var/www/erro',
     filename       => 'zzz-erro',
+    tag            => 'all',
   }
 
   # TODO: this is temporary: remove when all nodes have applied it