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

diff --git a/manifests/site.pp b/manifests/site.pp
index b2ee4e5ac..2fecb32c5 100644
--- 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,schein:            { include named::recursor }
+        bartok,schein,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein: { 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,villa,lobos,raff,gluck,schein: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
            @ferm::rule { "dsa-ftp":
 		    domain          => "(ip ip6)",
 		    description     => "Allow ftp access",