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

diff --git a/manifests/site.pp b/manifests/site.pp
index 8a10a5931..d19223be9 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":   {
@@ -75,11 +82,22 @@ node default {
         geo1,geo2,geo3:           { include named::geodns }
         bartok:                   { include named::recursor }
     }
-
+    
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok: { include ferm }
+	senfl: { include rsync }
     }
 
+    case $hostname {
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti: { 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;"
+           }
+        }
+    }
     case $brokenhosts {
         "true":    { include hosts }
     }
@@ -89,8 +107,5 @@ node default {
     case $portforwarder_user_exists {
         "true":    { include portforwarder }
     }
-    case $kernel {
-        "GNU/kFreeBSD":    { include kfreebsd }
-    }
     include samhain
 }