Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 79cd34ced72cbf0b31657e6d94c3f4627f9daa8b..2a27462999fac338fc22e8135abc87c08f6c840b 100644 (file)
--- 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,7 +93,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 }
+        franck,liszt,master,samosa,schein,spohr,steffani,widor:   { include named::recursor }
     }
 
     case $kernel {
@@ -94,7 +104,7 @@ node default {
     }
 
     case $hostname {
-        beethoven,ravel,spohr: {
+        beethoven,ravel,spohr,stabile: {
             include nfs-server
         }
     }
@@ -112,14 +122,14 @@ node default {
     include samhain
 
     case $hostname {
-        byrd,schuetz,draghi: {
+        byrd,schuetz: {
             include krb
         }
-        bartok,draghi: {
+        draghi,quantz,samosa: {
             include krb
             include afs
         }
-        lamb,locke,rautavaara: {
+        lamb,locke,rautavaara,rietz: {
             include krb
             include afs::server
         }