X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=2fecb32c593fb7e358eeb084a0e8e6490cb76b97;hb=b9d744e92a7fddb16c21ea6b3522e96b64a9a05c;hp=23908f5e9f465e7c450a73ad857ba7f8a45168ce;hpb=ece3546e817fadf7f074a47325bb35b2f0066c30;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 23908f5e9..2fecb32c5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -31,7 +31,10 @@ node default {
     include ntp
 
     include motd
-    include samhain
+
+    case $hostname {
+        finzi,fano,fasch,field:    { include kfreebsd }
+    }
 
     case $smartarraycontroller {
         "true":    { include debian-proliant }
@@ -39,6 +42,9 @@ node default {
     case $kvmdomain {
         "true":    { package { acpid: ensure => installed } }
     }
+    case $mptraid {
+        "true":    { include "raidmpt" }
+    }
 
     case $mta {
         "exim4":   {
@@ -68,18 +74,53 @@ node default {
     }
 
     case extractnodeinfo($nodeinfo, 'buildd') {
-         true:  { include buildd }
+         true:  {
+             include buildd
+             case $kernel {
+                 'Linux': {
+                     include ferm
+                 }
+             }
+         }
     }
 
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
+        bartok,schein,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball: { 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,villa,lobos,raff,gluck,schein,wieck,steffani: {
+           @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,4 +130,5 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
+    include samhain
 }