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 fdeef9549d30bf563695622f295c3e8dd0352fc6..2a27462999fac338fc22e8135abc87c08f6c840b 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -79,6 +79,11 @@ node default {
          }
     }
 
+    case $rsyncd {
+         "true": { include rsyncd-log }
+    }
+
+
     case extractnodeinfo($nodeinfo, 'buildd') {
          'true':  {
              include buildd
@@ -88,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 {
@@ -120,7 +125,7 @@ node default {
         byrd,schuetz: {
             include krb
         }
-        bartok,draghi,quantz: {
+        draghi,quantz,samosa: {
             include krb
             include afs
         }