X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=fdeef9549d30bf563695622f295c3e8dd0352fc6;hb=855076649153460fd8e3e3d3860d6783c7684470;hp=4504a595556da11fefa207e286fac5680da57786;hpb=d8ba8b9a5e0bfba9ab8c70bf63ff386e4228bf5f;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 4504a5955..fdeef9549 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -22,6 +22,7 @@ node default {
     notice("hoster for ${fqdn} is ${hoster}")
 
     include munin-node
+    include syslog-ng
     include sudo
     include ssh
     include debian-org
@@ -40,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" }
@@ -93,7 +99,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr: {
+        beethoven,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -111,10 +117,17 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,draghi,lamb:    { include krb }
-    }
-    case $hostname {
-        lamb:    { include afs::server }
+        byrd,schuetz: {
+            include krb
+        }
+        bartok,draghi,quantz: {
+            include krb
+            include afs
+        }
+        lamb,locke,rautavaara,rietz: {
+            include krb
+            include afs::server
+        }
     }
 }