X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d7a965dddee7e3c7b57cb9b8b0c4b2882f25f82f;hb=d06497885ecd69ba03a8c838c3ff6a4499821b44;hp=3bf505cecf3bae4b3780b2893c8b08a57c794a62;hpb=a0cae2108cbe9d88defce97fec799d1f592b2cc7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 3bf505cec..d7a965ddd 100644
--- 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,22 +127,16 @@ node default {
         }
     }
 
-    if $::brokenhosts == 'true' {
+    if $::brokenhosts {
         include hosts
     }
 
-    if $::portforwarder_user_exists == 'true' {
+    if $::portforwarder_user_exists {
         include portforwarder
     }
 
     include samhain
 
-    case $::hostname {
-        byrd,schuetz,tchaikovsky,draghi,quantz,lamb,locke,rautavaara,rietz: {
-            include krb
-        }
-    }
-
     case $::hostname {
         chopin,geo3,soler,wieck: {
             include debian-radvd
@@ -153,9 +147,7 @@ node default {
         include entropykey
     }
 
-    if $::postgres84 == "true" {
-        include postgres
-    } elsif $::postgres90 == "true" {
+    if ($::postgres84 or $::postgres90) {
         include postgres
     }
 }