X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=6755e0c8366b4b8005893731183f805139fffff6;hb=b51b3cc27c0df2f044147fb6a713f5ad89b26cad;hp=228c9af9280cae06a3bb777dc34602673015e80f;hpb=fb848f271f793af2dcf86001658769a2ca0435c1;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 228c9af92..6755e0c83 100644
--- 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
@@ -39,14 +39,15 @@ node default {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
-        case $debarchitecture {
-            kfreebsd-amd64,kfreebsd-i386: {
-            }
-            default: {
-                "true": {
+        "true": {
+            case $debarchitecture {
+                kfreebsd-amd64,kfreebsd-i386: {
+                }
+                default: {
                     package { acpid: ensure => installed }
-                    case getfromhash($nodeinfo, 'squeeze') {
-                        true:  { package { acpi-support-base: ensure => installed } }
+                    case $lsbdistcodename {
+                        'lenny':    { }
+                        default:    { package { acpi-support-base: ensure => installed } }
                     }
                 }
             }
@@ -111,15 +112,16 @@ node default {
     }
 
     case $hostname {
-        klecker,ravel,senfl,orff,draghi,diamond: { include named::authoritative }
+        ravel,senfl,orff,draghi,diamond: { include named::authoritative }
         geo1,geo2,geo3:                          { include named::geodns }
         liszt:                                   { include named::recursor }
     }
     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