Cannot assign a var twice?

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

diff --git a/manifests/site.pp b/manifests/site.pp
index aff54f9e44bbc64e683f10a6bf2b62842660083c..9bab5c60335546f7c243de8cf257820ea85cf83e 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -17,7 +17,7 @@ node default {
     $localinfo = yamlinfo('*', "/etc/puppet/modules/debian-org/misc/local.yaml")
     $nodeinfo  = nodeinfo($fqdn, "/etc/puppet/modules/debian-org/misc/local.yaml")
     $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord")
-    notice( sprintf("hoster for %s is %s", $fqdn, $nodeinfo) )
+    notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
     include syslog-ng
@@ -98,15 +98,23 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        franck,liszt,master,samosa,spohr,widor:   { include named::recursor }
+        liszt,widor:                     { include named::recursor }
     }
     case $hostname {
-        ries:   {
+        franck,master,murphy,ries,samosa,spohr:   {
             include unbound
             $runs_local_resolver = true
         }
         default: {
-            $runs_local_resolver = false
+            case getfromhash($nodeinfo, 'squeeze') {
+                true:  {
+                    include unbound
+                    $runs_local_resolver = true
+                }
+                default: {
+                    $runs_local_resolver = false
+                }
+            }
         }
     }
     include resolv