let's try this now

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/manifests/site.pp b/manifests/site.pp
index 3bf505cecf3bae4b3780b2893c8b08a57c794a62..588e9b5557b30a75bdbeef2fad8e25241d8af3f5 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -35,7 +35,7 @@ node default {
         finzi,fano,fasch,field:    { include kfreebsd }
     }
 
-    if $::smartarraycontroller == 'true' {
+    if $::smartarraycontroller {
         include debian-proliant
     }
 
@@ -43,11 +43,11 @@ node default {
         include megactl
     }
 
-    if $::mptraid == 'true' {
+    if $::mptraid {
         include raidmpt
     }
 
-    if $::kvmdomain == 'true' {
+    if $::kvmdomain {
         include acpi
     }
 
@@ -71,7 +71,7 @@ node default {
         default: { include nagios::client }
     }
 
-    if $::apache2 == 'true' {
+    if $::apache2 {
          if getfromhash($nodeinfo, 'apache2_security_mirror') {
                 include apache2::security_mirror
          }
@@ -87,7 +87,7 @@ node default {
          include apache2
     }
 
-    if $::rsyncd == 'true' {
+    if $::rsyncd {
         include rsyncd-log
     }
 
@@ -127,11 +127,11 @@ node default {
         }
     }
 
-    if $::brokenhosts == 'true' {
+    if $::brokenhosts {
         include hosts
     }
 
-    if $::portforwarder_user_exists == 'true' {
+    if $::portforwarder_user_exists {
         include portforwarder
     }
 
@@ -153,9 +153,7 @@ node default {
         include entropykey
     }
 
-    if $::postgres84 == "true" {
-        include postgres
-    } elsif $::postgres90 == "true" {
+    if ($::postgres84 or $::postgres90) {
         include postgres
     }
 }