No need for virtual website resources; overriding is enough

diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index a71506da8a3c44b8582a4bfc04266b425b54cdbc..60944a977f70180f8066651cbb977de8893b02c5 100644 (file)
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -144,27 +144,26 @@ class websites::hosting inherits websites::setup {
   include pmwiki
   include apache::rails
 
-  Apache::Site       <| tag == $hostname or tag == 'all' |>
-  Database::Instance <| tag == $hostname or tag == 'all' |>
-  Ikiwiki::Instance  <| tag == $hostname or tag == 'all' |>
+  apache::site { "images":
+    docroot => "${apache_www_folder}/images",
+    mpm     => false,
+    tag     => 'all',
+  }
 
+  # Remove untagged site instances
   Apache::Site <| tag != $hostname and tag != 'all' |> {
     ensure => absent,
   }
 
+  # Remove untagged database instances
   Database::Instance <| tag != $hostname and tag != 'all' |> {
     ensure => absent,
   }
 
+  # Remove untagged ikiwiki instances
   Ikiwiki::Instance <| tag != $hostname and tag != 'all' |> {
     ensure => absent,
   }
-
-  @apache::site { "images":
-    docroot => "${apache_www_folder}/images",
-    mpm     => false,
-    tag     => 'all',
-  }
 }
 
 class websites::hosting::admin inherits websites::setup {