X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=manifests%2Fsite.pp;h=920ebfa77ec441ffed3bda5a17c69ef88a88ff1e;hb=fbdfced4d644a867a1913ff13e94fb6851bb8442;hp=08e5fec3dedfb082f6e88ddb86e0007dc95ea067;hpb=00f10ba994dcc5c06b1d0e437cbdbfcabb3e974f;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 08e5fec3d..920ebfa77 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,9 +17,9 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
-    $keyinfo   = allnodeinfo("sshRSAHostKey", "ipHostNumber", "purpose")
+    $allnodeinfo = allnodeinfo(["sshRSAHostKey", "ipHostNumber"], ["purpose"])
     $mxinfo    = allnodeinfo("mXRecord")
-    notice("hoster for ${fqdn} is ${getfromhash(hosterinfo, 'name')}")
+    notice("hoster for ${fqdn} is ${hosterinfo}")
 
     include munin-node
     include syslog-ng
@@ -100,7 +100,20 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,schein,spohr,steffani,widor:   { include named::recursor }
+        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+    }
+    case $hostname {
+        ries:   {
+            include unbound
+            $runs_local_resolver = true
+        }
+        default: {
+            $runs_local_resolver = false
+        }
+    }
+    case getfromhash($hosterinfo, 'nameservers') {
+        false:      {}
+        default:    { include resolv }
     }
 
     case $kernel {
@@ -122,9 +135,6 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, 'name') {
-        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
-    }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }