some more ferm fixups

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 953cc45587d60fe9eeb58899f699f2bb0d67cab4..52e1e0d766ca5d5345ea09d14bea7e5397c90c0d 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -74,17 +74,24 @@ 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,senfl,beethoven,piatti,saens: { include ferm }
+        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball: { include ferm }
     }
     case $hostname {
         piatti: {
@@ -100,7 +107,7 @@ node default {
                    rule            => "&SERVICE(tcp, 873)"
           }
         }
-        saens: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
            @ferm::rule { "dsa-ftp":
                    domain          => "(ip ip6)",
                    description     => "Allow ftp access",