X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9559e48694eee741ce3da86b048477bd948000ef;hb=e87023eb37f56ab199828de0211b0e8b60401680;hp=6c361b240ec501166930caeaba65f502e82f610d;hpb=60856336673c0e432966c18b5afb2377b1891a16;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6c361b240..9559e4869 100644
--- 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,vitry,vivaldi,wolkenstein: { include ferm }
+    }
+
     case $hostname {
         zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-rrdcollect":
@@ -111,14 +119,14 @@ node default {
                rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
            }
         }
-	senfl,kaufmann: {
+	senfl: {
 	   @ferm::rule { "dsa-rsync":
 		    domain          => "(ip ip6)",
 		    description     => "Allow rsync access",
 		    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 {