X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=f57efd2daa95eeba2bb152474211f2fad8f76538;hb=7d330f2d62c3309cb6176cc38f4100875134840c;hp=66d16224d3af558edcd31e044101e1474ad0f337;hpb=7ff9a06b9c3affc9eaf3d28f9b8f00f685b7dd9a;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 66d16224d..f57efd2da 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -43,54 +43,50 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  "true":  { include exim::mx }
+                  true:    { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
     case extractnodeinfo($nodeinfo, 'muninmaster') {
-        "true": {
-                      include munin-node::master
-        }
+        true: { include munin-node::master }
     }
 
     case extractnodeinfo($nodeinfo, 'nagiosmaster') {
-        "true": {
-                      include nagios::server
-        }
-        default: {
-		      include nagios::client
-	}
+        true:    { include nagios::server }
+        default: { include nagios::client }
     }
 
     case $apache2 {
          "true":  {
               case extractnodeinfo($nodeinfo, 'apache2_security_mirror') {
-                     "true":  { include apache2::security_mirror }
+                     true:    { include apache2::security_mirror }
                      default: { include apache2 }
               }
          }
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         "true":  { include buildd }
+         true:  { include buildd }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
+        geo1,geo2,geo3:           { include named::geodns }
     }
 
     case $hostname {
-        logtest01: { include ferm }
-    }
-    case $hostname {
-        geo1,geo2,geo3: { include named::geodns }
+        logtest01,geo1,geo2,geo3: { include ferm }
     }
+
     case $brokenhosts {
         "true":    { include hosts }
     }
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }