add wolkenstein

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

diff --git a/manifests/site.pp b/manifests/site.pp
index c7cedf2ae213cbda46025c2a0e218b6c13331981..045103d2862d4d70214e24f98ea96c4e36afde4f 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -88,12 +88,20 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani:   { include named::recursor }
+        bartok,schein,steffani,franck:   { include named::recursor }
     }
 
     case $hostname {
         franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen,kaufmann: { include ferm }
     }
+
+    case $hostname {
+        agricola,albeniz,gabrielli,merulo,paer,pergolesi,pescetti,smetana,sperger,zee,zelenka: { include ferm }
+    }
+    case $hostname {
+        orff,duarte,soler,lindberg,wolkenstein: { include ferm }
+    }
+
     case $hostname {
         zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-rrdcollect":
@@ -118,7 +126,7 @@ node default {
                    rule            => "&SERVICE(tcp, 873)"
           }
         }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani,franck: {
            @ferm::rule { "dsa-ftp":
                    domain          => "(ip ip6)",
                    description     => "Allow ftp access",
@@ -185,6 +193,11 @@ node default {
                    description     => "Allow hkp access",
                    rule            => "&SERVICE(tcp, 11371)"
            }
+          @ferm::rule { "dsa-rsync":
+                   domain          => "(ip ip6)",
+                   description     => "Allow rsync access",
+                   rule            => "&SERVICE(tcp, 873)"
+          }
        }
     }
     case $brokenhosts {