X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=7de155a929c4df46b61e9bff39c9f882216cae9e;hb=8f55a625c7ea3556312ddbd46ee427f52c4e6886;hp=9a09d547f8d5a5282980a319ad4a5e5da4681d55;hpb=3b3fea726ba4fbc9aa9cecad6b1eb6bf3232406d;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9a09d547f..7de155a92 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,10 +16,10 @@ Exec {
 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")
+    $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
+    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
     $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${hoster}")
+    notice("hoster for ${fqdn} is ${getfromhash(hosterinfo, 'name')}")
 
     include munin-node
     include syslog-ng
@@ -122,7 +122,7 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case $hoster {
+    case getfromhash($hosterinfo, "name") {
         "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
     }
     case $portforwarder_user_exists {
@@ -147,7 +147,7 @@ node default {
 
     case $hostname {
         chopin,geo3,soler,wieck: {
-            include sysctl
+            include debian-radvd
         }
    }
 }