Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 948beaf22919d03792c25d3c47fb2cc463a79f4c..4ad02242ac9acfd6afb3d2a89c456022d66be703 100644 (file)
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -29,6 +29,7 @@ node default {
     include monit
     include apt-keys
     include ntp
+    include ssl
 
     include motd
 
@@ -49,7 +50,7 @@ node default {
     case $mta {
         "exim4":   {
              case extractnodeinfo($nodeinfo, 'heavy_exim') {
-                  true:    { include exim::mx }
+                  'true':  { include exim::mx }
                   default: { include exim }
              }
         }
@@ -74,19 +75,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,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,wieck,steffani: { include ferm }
+        franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen: { 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",
@@ -112,6 +130,55 @@ 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)"
+          }
+        }
+       powell: {
+          @ferm::rule { "dsa-powell-v6-tunnel":
+                   description     => "Allow powell to use V6 tunnel broker",
+                   rule            => "proto ipv6 saddr 212.227.117.6 jump ACCEPT"
+          }
+          @ferm::rule { "dsa-powell-btseed":
+                    domain          => "(ip ip6)",
+                   description     => "Allow powell to seed BT",
+                   rule            => "proto tcp dport 8000:8100 jump ACCEPT"
+          }
+           @ferm::rule { "dsa-powell-rsync":
+                    description     => "Hoster wants to sync from here, and why not",
+                    rule            => "&SERVICE_RANGE(tcp, rsync, ( 195.20.242.90 192.25.206.33 82.195.75.106 206.12.19.118 ))"
+           }
+       }
+       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",
+          }
+       }
+        heininen: {
+          @ferm::rule { "dsa-syslog":
+                   description     => "Allow syslog access",
+                   rule            => "&SERVICE_RANGE(tcp, 5140, \$HOST_DEBIAN_V4)"
+          }
+          @ferm::rule { "dsa-syslog-v6":
+                   domain          => 'ip6',
+                   description     => "Allow syslog access",
+                   rule            => "&SERVICE_RANGE(tcp, 5140, \$HOST_DEBIAN_V6)"
+          }
+        }
 
     }
     case $brokenhosts {