X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=7a8565dbde89fa7a956cee860d1b85c78e35bb3c;hb=d18bb90cf17cc35126f7bb4d60fa54f360024bc9;hp=456b7fc75a63a230b428b59e232be52438fa0bf1;hpb=7a9cafaa802422be52e20d1084ed243615e527b1;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 456b7fc75..7a8565dbd 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:                   { include named::recursor }
+        bartok,schein,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos: { 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: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
            @ferm::rule { "dsa-ftp":
 		    domain          => "(ip ip6)",
 		    description     => "Allow ftp access",
@@ -112,6 +119,12 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
+        ancina,zelenka: {
+	   @ferm::rule { "dsa-time":
+		    description     => "Allow time access",
+		    rule            => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
+	   }
+        }
 
     }
     case $brokenhosts {