From 1830ea97e9c41daf2a738d2aa2d10ee1b76e8cd3 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Tue, 29 Nov 2011 23:00:23 -0200 Subject: Do not use virtual resources at websites::setup; tags should be enough --- manifests/subsystems/websites.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/subsystems/websites.pp') 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', -- cgit v1.2.3