X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=c518cd69b2d230c539973c6a7bbe12d83a31a646;hb=3287d868d5d0c4934f21aa6b6f068ec065507881;hp=564d270fc662a5776985b738714fe58baea0fcdf;hpb=b3f915434eb31aef5a7730178c1c3b608a011059;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 564d270fc..c518cd69b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -41,7 +41,12 @@ node default {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
-        "true":    { package { acpid: ensure => installed } }
+        "true": {
+            package { acpid: ensure => installed }
+            case extractnodeinfo($nodeinfo, 'squeeze') {
+                'true':  { package { acpi-support-base: ensure => installed } }
+            }
+        }
     }
     case $mptraid {
         "true":    { include "raidmpt" }
@@ -83,7 +88,7 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff,draghi: { include named::authoritative }
         geo1,geo2,geo3:                  { include named::geodns }
-        bartok,franck,liszt,master,samosa,schein,spohr,steffani:   { include named::recursor }
+        bartok,franck,liszt,master,samosa,schein,spohr,steffani,widor:   { include named::recursor }
     }
 
     case $kernel {
@@ -94,7 +99,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr: {
+        beethoven,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -112,10 +117,17 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,draghi,lamb,locke,rautavaara:    { include krb }
-    }
-    case $hostname {
-        lamb,locke,rautavaara:    { include afs::server }
+        byrd,schuetz: {
+            include krb
+        }
+        bartok,draghi,quantz,samosa: {
+            include krb
+            include afs
+        }
+        lamb,locke,rautavaara,rietz: {
+            include krb
+            include afs::server
+        }
     }
 }