X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=00f3d50c582c988b7dc8fab13527716978faed4f;hb=46275e646b84c1f6bad2673fc3d118fb22ec24bf;hp=35de8860ac2efbf97d624fcd3e2c65b0f29554cf;hpb=06f8e083701d1c0886668573295fa2dc7bb7980c;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 35de8860a..00f3d50c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,6 +17,7 @@ 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")
@@ -30,7 +31,10 @@ node default {
     include ntp
 
     include motd
-    include samhain
+
+    case $hostname {
+        finzi,fano,fasch,field:    { include kfreebsd }
+    }
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -38,58 +42,59 @@ node default {
     case $kvmdomain {
         "true":    { package { acpid: ensure => installed } }
     }
+    case $mptraid {
+        "true":    { include raid-mpt }
+    }
 
     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 }
+        bartok:                   { include named::recursor }
     }
 
     case $hostname {
-        logtest01: { include ferm }
-    }
-    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 }
+    }
+    include samhain
 }