X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=bcf57b835e69df84a395ec28da8a6ef2c36946ee;hb=7aada4511d012b71f8378d2b5c0f35dc7a2a6dea;hp=9518633d9110a2e40323a588130ccefb59626174;hpb=bd0fb7dc8da04285aac6a50f78c064588d457ed2;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 9518633d9..bcf57b835 100644
--- 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 }
              }
         }
@@ -76,35 +77,40 @@ node default {
     case extractnodeinfo($nodeinfo, '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,steffani:   { include named::recursor }
+        bartok,schein,steffani,ries,franck,liszt,master:   { include named::recursor }
     }
 
     case $hostname {
-        logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky: { include ferm }
+        bellini,cilea,merikanto,petterson,sibelius: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
+
     case $hostname {
-        zandonai,zelenka: {
+        ancina,zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-rrdcollect":
                description  => "port 6666 for rrdcollect for zivit",
                rule         => "&SERVICE_RANGE(tcp, 6666, ( 10.130.18.71 ))"
            }
-        }
-        zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-zabbix":
                description  => "port 10050 for zabbix for zivit",
                rule         => "&SERVICE_RANGE(tcp, 10050, ( 10.130.18.76 ))"
            }
+	   @ferm::rule { "dsa-time":
+		    description     => "Allow time access",
+		    rule            => "&SERVICE_RANGE(tcp, time, \$HOST_NAGIOS_V4)"
+	   }
         }
         piatti: {
            @ferm::rule { "dsa-udd-stunnel":
@@ -119,7 +125,7 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani,ries,rietz,franck,morricone,valente,klecker: {
            @ferm::rule { "dsa-ftp":
 		    domain          => "(ip ip6)",
 		    description     => "Allow ftp access",
@@ -131,12 +137,6 @@ 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",
@@ -148,7 +148,57 @@ node default {
 		    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)"
+	   }
+        }
+	kaufmann: {
+           @ferm::rule { "dsa-hkp":
+		    domain          => "(ip ip6)",
+		    description     => "Allow hkp access",
+		    rule            => "&SERVICE(tcp, 11371)"
+           }
+	   @ferm::rule { "dsa-rsync":
+		    domain          => "(ip ip6)",
+		    description     => "Allow rsync access",
+		    rule            => "&SERVICE(tcp, 873)"
+	   }
+	}
+	liszt: {
+           @ferm::rule { "smtp":
+		    domain          => "(ip ip6)",
+		    description     => "Allow smtp access",
+		    rule            => "&SERVICE(tcp, 25)"
+           }
+        }
     }
     case $brokenhosts {
         "true":    { include hosts }