aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2011-11-29 23:00:23 -0200
committerSilvio Rhatto <rhatto@riseup.net>2011-11-29 23:00:23 -0200
commit1830ea97e9c41daf2a738d2aa2d10ee1b76e8cd3 (patch)
tree048696a95a2a0bdeb4eb0a9ec53b2114731dbb35 /manifests
parent0fd9b92d5f5a2f2c5c6ad1e5e4b8c8baadad6af6 (diff)
downloadpuppet-nodo-1830ea97e9c41daf2a738d2aa2d10ee1b76e8cd3.tar.gz
puppet-nodo-1830ea97e9c41daf2a738d2aa2d10ee1b76e8cd3.tar.bz2
Do not use virtual resources at websites::setup; tags should be enough
Diffstat (limited to 'manifests')
-rw-r--r--manifests/subsystems/websites.pp6
1 files changed, 3 insertions, 3 deletions
diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 4aa872a..a71506d 100644
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -66,7 +66,7 @@ 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,
@@ -74,7 +74,7 @@ class websites::setup {
}
# 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',
@@ -102,7 +102,7 @@ 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',