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

diff --git a/manifests/site.pp b/manifests/site.pp
index abceb1fb7..66d16224d 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,8 +49,14 @@ node default {
         }
     }
 
-    case $hostname {
-        spohr: {
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        "true": {
+                      include munin-node::master
+        }
+    }
+
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        "true": {
                       include nagios::server
         }
         default: {
@@ -71,9 +78,12 @@ node default {
     }
 
     case $hostname {
-        rietz,raff,klecker,ravel,senfl: { include named::secondary }
+        klecker,ravel,senfl,orff: { include named::secondary }
     }
 
+    case $hostname {
+        logtest01: { include ferm }
+    }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
     }
@@ -81,6 +91,6 @@ node default {
         "true":    { include hosts }
     }
     case $hoster {
-        "ubcece", "darmstadt":  { include resolv }
+        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
 }