Use unbound on ries

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 97df07e7c3695914d83ff1a9c7108ba088c19e69..b813499098614edc2a181c80a4bad8aea32d7339 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -100,7 +100,10 @@ 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 }
     }
 
     case $kernel {
@@ -122,8 +125,9 @@ node default {
     case $brokenhosts {
         "true":    { include hosts }
     }
-    case getfromhash($hosterinfo, 'name') {
-        "ubcece", "darmstadt", "ftcollins", "grnet":  { include resolv }
+    case getfromhash($hosterinfo, 'nameservers') {
+        false:      {}
+        default:    { include resolv }
     }
     case $portforwarder_user_exists {
         "true":    { include portforwarder }