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

diff --git a/manifests/site.pp b/manifests/site.pp
index 27a8a23bd..953cc4558 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -32,12 +32,19 @@ node default {
 
     include motd
 
+    case $hostname {
+        finzi,fano,fasch,field:    { include kfreebsd }
+    }
+
     case $smartarraycontroller {
         "true":    { include debian-proliant }
     }
     case $kvmdomain {
         "true":    { package { acpid: ensure => installed } }
     }
+    case $mptraid {
+        "true":    { include "raidmpt" }
+    }
 
     case $mta {
         "exim4":   {
@@ -77,9 +84,36 @@ node default {
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok: { 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         => "&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 }
     }
@@ -89,8 +123,5 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
-    case $debarchitecture {
-        "kfreebsd-amd64", "kfreebsd-i386":    { include kfreebsd }
-    }
     include samhain
 }