X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=d6ec89f64b6087c2a07bc31f57d50b07764336fb;hb=571572f372320efab5230dc52f7591ba0d2831ef;hp=aa4f69c8bf496ad2a019f1d5e6a3fcd459e1ce98;hpb=7d73c723bcb21b85f1819e0f2e0b7838a1d515a7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index aa4f69c8b..d6ec89f64 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")
@@ -48,11 +49,16 @@ node default {
         }
     }
 
-    case $hostname {
-        spohr: {
-                      include nagios::server
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        "true": {
                       include munin-node::master
         }
+    }
+
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        "true": {
+                      include nagios::server
+        }
         default: {
 		      include nagios::client
 	}
@@ -72,9 +78,12 @@ node default {
     }
 
     case $hostname {
-        rietz,klecker,ravel,senfl,orff: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }
@@ -84,4 +93,7 @@ node default {
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }