and for unbound

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 6c7ec54d0b71ebd5c4222578c8b3ab940357e292..baba96b6aae25c7f2347a246b8f84e2b0d188299 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -16,7 +16,7 @@ Exec {
 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")
+    $allnodeinfo = allnodeinfo("sshRSAHostKey ipHostNumber", "purpose mXRecord physicalHost purpose")
     notice( sprintf("hoster for %s is %s", $fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
 
     include munin-node
@@ -118,8 +118,9 @@ node default {
     case $hostname {
         franck,master,lobos,samosa,spohr,widor:   { include unbound }
     }
-    case getfromhash($nodeinfo, 'squeeze') {
-        true:  { include unbound }
+    case $lsbdistcodename {
+        'lenny':    { }
+        default:    { include unbound }
     }
     include resolv