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

diff --git a/manifests/site.pp b/manifests/site.pp
index fb85a46d4..d6ec89f64 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
@@ -49,13 +49,14 @@ node default {
         }
     }
 
-    case $hostname {
-        spohr: {
+    case extractnodeinfo($nodeinfo, 'muninmaster') {
+        "true": {
                       include munin-node::master
         }
     }
-    case $hostname {
-        tchaikovsky: {
+
+    case extractnodeinfo($nodeinfo, 'nagiosmaster') {
+        "true": {
                       include nagios::server
         }
         default: {
@@ -81,7 +82,7 @@ node default {
     }
 
     case $hostname {
-        logtest01: { include ferm::real }
+        logtest01: { include ferm }
     }
     case $hostname {
         geo1,geo2,geo3: { include named::geodns }
@@ -92,4 +93,7 @@ node default {
     case $hoster {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
+    case $portforwarder_user_exists {
+        "true":    { include portforwarder }
+    }
 }