aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-11-29 22:51:44 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-11-29 22:51:44 -0200
commit7f997c8d080cbb11937e462dc10e9ae0ddcd7e5c (patch)
tree710ef7f64c88dcaea876cea75b91564d8c3a9584
parentc10b8050b3fd2ea862f8137f15399b230e8133db (diff)
downloadpuppet-bootstrap-7f997c8d080cbb11937e462dc10e9ae0ddcd7e5c.tar.gz
puppet-bootstrap-7f997c8d080cbb11937e462dc10e9ae0ddcd7e5c.tar.bz2
Using tags and virtual resources for hosted websites and databases
-rw-r--r--templates/puppet/websites.pp.erb18
1 files changed, 8 insertions, 10 deletions
diff --git a/templates/puppet/websites.pp.erb b/templates/puppet/websites.pp.erb
index 75dcd0b..b1a82a2 100644
--- 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',
#}
}