From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 30 Nov 2011 00:45:43 +0000 (-0200)
Subject: You have to define a tag for websites; empty tags were not working
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=0fd9b92d5f5a2f2c5c6ad1e5e4b8c8baadad6af6;p=puppet-nodo.git

You have to define a tag for websites; empty tags were not working
---

diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp
index 01b3450..4aa872a 100644
--- a/manifests/subsystems/websites.pp
+++ b/manifests/subsystems/websites.pp
@@ -144,19 +144,19 @@ class websites::hosting inherits websites::setup {
   include pmwiki
   include apache::rails
 
-  Apache::Site       <| tag == $hostname or tag == 'all' or tag == '' |>
-  Database::Instance <| tag == $hostname or tag == 'all' or tag == '' |>
-  Ikiwiki::Instance  <| tag == $hostname or tag == 'all' or tag == '' |>
+  Apache::Site       <| tag == $hostname or tag == 'all' |>
+  Database::Instance <| tag == $hostname or tag == 'all' |>
+  Ikiwiki::Instance  <| tag == $hostname or tag == 'all' |>
 
-  Apache::Site <| tag != $hostname and tag != 'all' and tag != '' |> {
+  Apache::Site <| tag != $hostname and tag != 'all' |> {
     ensure => absent,
   }
 
-  Database::Instance <| tag != $hostname and tag != 'all' and tag != '' |> {
+  Database::Instance <| tag != $hostname and tag != 'all' |> {
     ensure => absent,
   }
 
-  Ikiwiki::Instance <| tag != $hostname and tag != 'all' and tag != '' |> {
+  Ikiwiki::Instance <| tag != $hostname and tag != 'all' |> {
     ensure => absent,
   }