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 456b7fc75a63a230b428b59e232be52438fa0bf1..a7b68384feca2d01abf48d48c51db12b2a1094ff 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -80,11 +80,11 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok:                   { include named::recursor }
+        bartok,schein,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball: { include ferm }
     }
     case $hostname {
         piatti: {
@@ -100,7 +100,7 @@ node default {
                    rule            => "&SERVICE(tcp, 873)"
           }
         }
-        saens,villa,lobos: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
            @ferm::rule { "dsa-ftp":
                    domain          => "(ip ip6)",
                    description     => "Allow ftp access",