X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=8b07c27b0c0ca1ab02f7435bd6e6a82c1c1d5721;hb=9e4e80d6ce4591c4cca8f87c630697d21f168cf2;hp=a69f518d4ed2f71bd22f3493e0212ba79d3463ca;hpb=158ae1d21302899bb695c4e358f6ba740ba167b7;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index a69f518d4..8b07c27b0 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 }
              }
         }
@@ -87,12 +88,17 @@ node default {
     case $hostname {
         klecker,ravel,senfl,orff: { include named::secondary }
         geo1,geo2,geo3:           { include named::geodns }
-        bartok,schein,steffani:   { include named::recursor }
+        bartok,schein,steffani,franck:   { 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 }
+        franck,powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky,heininen,nielsen,kokkonen,kaufmann: { include ferm }
     }
+
+    case $hostname {
+        agricola,albeniz,gabrielli,zee,zelenka: { include ferm }
+    }
+
     case $hostname {
         zandonai,zelenka: {
            @ferm::rule { "dsa-zivit-rrdcollect":
@@ -117,7 +123,7 @@ node default {
 		    rule            => "&SERVICE(tcp, 873)"
 	   }
         }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani: {
+        saens,villa,lobos,raff,gluck,schein,wieck,steffani,franck: {
            @ferm::rule { "dsa-ftp":
 		    domain          => "(ip ip6)",
 		    description     => "Allow ftp access",
@@ -146,7 +152,50 @@ 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)"
+	   }
+	}
     }
     case $brokenhosts {
         "true":    { include hosts }