Using tags and virtual resources for hosted websites and databases

diff --git a/templates/puppet/websites.pp.erb b/templates/puppet/websites.pp.erb
index 75dcd0bb40aebb185a3928b815ab71c836ed05ce..b1a82a23324876c30236a5e728c2e4a368f0466e 100644 (file)
--- a/templates/puppet/websites.pp.erb
+++ b/templates/puppet/websites.pp.erb
@@ -5,6 +5,7 @@ class websites::admin inherits websites::hosting::admin {
   #  use            => [ "Trac admin" ],
   #  redirect_match => "trac",
   #  mpm            => false,
+  #  tag            => 'all',
   #}
 
   #apache::site { "munin":
@@ -13,33 +14,30 @@ class websites::admin inherits websites::hosting::admin {
   #  owner          => "munin",
   #  group          => "munin",
   #  mpm            => false,
+  #  tag            => 'all',
   #}
 
   #apache::site { "nagios":
   #  source         => true,
   #  docroot        => '/usr/share/nagios3/htdocs',
   #  mpm            => false,
+  #  tag            => 'all',
   #}
 }
 
 class websites inherits websites::hosting {
-  # Website definitions
-  #
-  # TODO:
-  #
-  #  - Use virtual resources:
-  #    - Tags by locations where the site can be hosted.
-  #    - Possible integration with cache proxies.
-  #
+  # Website definitions: always use virtual resources
 
-  #apache::site { "site":
+  #@apache::site { "site":
   #  source         => true,
   #  ticket         => '001',
   #  docroot        => '/var/www/site',
+  #  tag            => 'all',
   #}
 
-  #database::instance { "site":
+  #@database::instance { "site":
   #  password => 'xxx',
+  #  tag      => 'all',
   #}  
 
 }