some more ferm fixups

[dsa-puppet.git] / manifests / site.pp

diff --git a/manifests/site.pp b/manifests/site.pp
index 27a8a23bd52c8369fc95a2f8380ad304db5f0049..52e1e0d766ca5d5345ea09d14bea7e5397c90c0d 100644 (file)
--- 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":   {
@@ -67,19 +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:                   { include named::recursor }
+        bartok,schein,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok: { 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,8 +130,5 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
-    case $debarchitecture {
-        "kfreebsd-amd64", "kfreebsd-i386":    { include kfreebsd }
-    }
     include samhain
 }