X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=b0d412981f60c8781af3b5d0b8ded43ade6a81db;hb=4f80d0392bf55eb18d241a9c872bf03ec12e6574;hp=29dc12c4181cd57a076937c3cb7b1281679ab6b9;hpb=72b5e6d46e812bf0ffda3e7828cbe3cdd84b2ead;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 29dc12c41..b0d412981 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" }
@@ -74,6 +79,11 @@ node default {
          }
     }
 
+    case $rsyncd {
+         "true": { include rsyncd-log }
+    }
+
+
     case extractnodeinfo($nodeinfo, 'buildd') {
          'true':  {
              include buildd
@@ -83,13 +93,16 @@ 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 }
+        franck,liszt,master,samosa,schein,spohr,steffani,widor:   { include named::recursor }
     }
 
     case $kernel {
         Linux: {
             include ferm
             include ferm::per-host
+            case $rsyncd {
+                "true": { include ferm::rsync }
+            }
         }
     }
 
@@ -112,10 +125,10 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz: {
+        byrd,schuetz,tchaikovsky: {
             include krb
         }
-        bartok,draghi,quantz: {
+        draghi,quantz,samosa: {
             include krb
             include afs
         }