X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=953cc45587d60fe9eeb58899f699f2bb0d67cab4;hb=f2f9d3efab7262bbdfb4e51feebfa6bd8aebc9a8;hp=d19223be942d77c7179edf634b9f1dfeaa3784ff;hpb=a28110e982ed24eb929e0942bc8291f8afeb5022;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index d19223be9..953cc4558 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -82,21 +82,37 @@ node default {
         geo1,geo2,geo3:           { include named::geodns }
         bartok:                   { include named::recursor }
     }
-    
-    case $hostname {
-	senfl: { include rsync }
-    }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens: { include ferm }
     }
     case $hostname {
         piatti: {
            @ferm::rule { "dsa-udd-stunnel":
                description  => "port 8080 for udd stunnel",
-               rule         => "proto tcp saddr ( 192.25.206.16 70.103.162.29 217.196.43.134 ) dport 8080 ACCEPT;"
+               rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
+           }
+        }
+	senfl: {
+	   @ferm::rule { "dsa-rsync":
+		    domain          => "(ip ip6)",
+		    description     => "Allow rsync access",
+		    rule            => "&SERVICE(tcp, 873)"
+	   }
+        }
+        saens: {
+           @ferm::rule { "dsa-ftp":
+		    domain          => "(ip ip6)",
+		    description     => "Allow ftp access",
+		    rule            => "&SERVICE(tcp, 21)"
            }
+	   @ferm::rule { "dsa-rsync":
+		    domain          => "(ip ip6)",
+		    description     => "Allow rsync access",
+		    rule            => "&SERVICE(tcp, 873)"
+	   }
         }
+
     }
     case $brokenhosts {
         "true":    { include hosts }