ah, : missing

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

diff --git a/manifests/site.pp b/manifests/site.pp
index f57efd2daa95eeba2bb152474211f2fad8f76538..953cc45587d60fe9eeb58899f699f2bb0d67cab4 100644 (file)
--- 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":   {
@@ -74,12 +80,40 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
+        bartok:                   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3: { 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,4 +123,5 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
+    include samhain
 }