X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6f50f2486f9b2459d30645680dab2716f6aaa317;hb=00e517d7263eeacf248ef66f4863ae2bff1197e8;hp=fb85a46d4d4701c5c1a1f61740f473f431653e2a;hpb=31cc527d395038046cf965a79fc3b9ea9aed6160;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index fb85a46d4..6f50f2486 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,11 +17,11 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hoster    = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber")
     notice("hoster for ${fqdn} is ${hoster}")
 
     $mxinfo   = allnodeinfo("mXRecord")
 
-    include ferm
     include munin-node
     include sudo
     include ssh
@@ -43,53 +43,51 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  "true":  { include exim::mx }
+                  true:    { include exim::mx }
                   default: { include exim }
              }
         }
     }
 
-    case $hostname {
-        spohr: {
-                      include munin-node::master
-        }
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        true: { include munin-node::master }
     }
-    case $hostname {
-        tchaikovsky: {
-                      include nagios::server
-        }
-        default: {
-		      include nagios::client
-	}
+
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        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 }
+        bartok:                   { include named::recursor }
     }
 
     case $hostname {
-        logtest01: { include ferm::real }
-    }
-    case $hostname {
-        geo1,geo2,geo3: { include named::geodns }
+        logtest01,geo1,geo2,geo3,bartok: { include ferm }
     }
+
     case $brokenhosts {
         "true":    { include hosts }
     }
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }