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

diff --git a/manifests/site.pp b/manifests/site.pp
index 456b7fc75..a5d96b4de 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -49,7 +49,7 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  true:    { include exim::mx }
+                  'true':  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -74,19 +74,36 @@ 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,handel,tchaikovsky: { include ferm }
     }
     case $hostname {
+        zandonai,zelenka: {
+           @ferm::rule { "dsa-zivit-rrdcollect":
+               description  => "port 6666 for rrdcollect for zivit",
+               rule         => "&SERVICE_RANGE(tcp, 6666, ( 10.130.18.71 ))"
+           }
+           @ferm::rule { "dsa-zivit-zabbix":
+               description  => "port 10050 for zabbix for zivit",
+               rule         => "&SERVICE_RANGE(tcp, 10050, ( 10.130.18.76 ))"
+           }
+        }
         piatti: {
            @ferm::rule { "dsa-udd-stunnel":
                description  => "port 8080 for udd stunnel",
@@ -100,7 +117,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 +129,29 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
+        ancina,zelenka: {
+	   @ferm::rule { "dsa-time":
+		    description     => "Allow time access",
+		    rule            => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
+	   }
+        }
+        handel: {
+	   @ferm::rule { "dsa-puppet":
+		    description     => "Allow puppet access",
+		    rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V4)"
+	   }
+	   @ferm::rule { "dsa-puppet-v6":
+		    domain          => 'ip6',
+		    description     => "Allow puppet access",
+		    rule            => "&SERVICE_RANGE(tcp, 8140, \$HOST_DEBIAN_V6)"
+	   }
+        }
+	beethoven: {
+	   @ferm::rule { "dsa-merikanto-beethoven":
+		    description     => "Allow merikanto",  # for nfs, and that uses all kind of ports by default.
+		    rule            => "source 172.22.127.147 interface bond0 jump ACCEPT",
+	   }
+	}
 
     }
     case $brokenhosts {