Try setting a var

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 08e5fec3dedfb082f6e88ddb86e0007dc95ea067..163adde0d509ce386c977bd4622c0e0f68973a6f 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -19,7 +19,7 @@ node default {
     $hosterinfo = whohosts($nodeinfo, "/etc/puppet/modules/debian-org/misc/hoster.yaml")
     $keyinfo   = 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 }
     }