X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=inline;f=manifests%2Fsite.pp;h=e731c6b78ad55860988707319d28c0d168b32fbd;hb=2b2ef6bf81f2d7b669230c0cc45fcf11d4430215;hp=49fc8530b7fe5dfee41092497a5f59e0fba32c51;hpb=41a9ab3d64cd6e063a191894e18978c03308dd66;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 49fc8530b..e731c6b78 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -88,7 +88,7 @@ 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,fracnk:   { include named::recursor }
     }
 
     case $hostname {
@@ -118,7 +118,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",
@@ -182,9 +182,14 @@ node default {
 	kaufmann: {
            @ferm::rule { "dsa-hkp":
 		    domain          => "(ip ip6)",
-		    description     => "Allow ftp access",
+		    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 {