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

diff --git a/manifests/site.pp b/manifests/site.pp
index baba96b6a..6755e0c83 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -45,8 +45,9 @@ node default {
                 }
                 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,7 +112,7 @@ 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 }
     }