diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-11-29 22:03:41 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-11-29 22:03:41 -0200 |
| commit | e7f7b19dd5b66607ca1f9319f6bf9805bc3461bb (patch) | |
| tree | d9189cddc5a36e344a301dafe7637b97ebcd18e3 /manifests/subsystems | |
| parent | 0d75774fb8c522fcb5fb238224fa40d07c5b2a31 (diff) | |
| download | puppet-nodo-e7f7b19dd5b66607ca1f9319f6bf9805bc3461bb.tar.gz puppet-nodo-e7f7b19dd5b66607ca1f9319f6bf9805bc3461bb.tar.bz2 | |
Using virtual resources for all apache::site definitions
Diffstat (limited to 'manifests/subsystems')
| -rw-r--r-- | manifests/subsystems/websites.pp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp index 21b924f..01b3450 100644 --- 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 |