Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 9bab5c6..144a401 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -101,21 +101,10 @@ node default {
         liszt,widor:                     { include named::recursor }
     }
     case $hostname {
-        franck,master,murphy,ries,samosa,spohr:   {
-            include unbound
-            $runs_local_resolver = true
-        }
-        default: {
-            case getfromhash($nodeinfo, 'squeeze') {
-                true:  {
-                    include unbound
-                    $runs_local_resolver = true
-                }
-                default: {
-                    $runs_local_resolver = false
-                }
-            }
-        }
+        franck,master,merikanto,lobos,murphy,ries,samosa,smetana,spohr:   { include unbound }
+    }
+    case getfromhash($nodeinfo, 'squeeze') {
+        true:  { include unbound }
     }
     include resolv