From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Nov 2011 01:00:23 +0000 (-0200)
Subject: Do not use virtual resources at websites::setup; tags should be enough
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=1830ea97e9c41daf2a738d2aa2d10ee1b76e8cd3;p=puppet-nodo.git

Do not use virtual resources at websites::setup; tags should be enough
---

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',