X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=manifests%2Fsite.pp;h=9a97d80aadb839dc72e7f7fdc909209eb05afa44;hb=9cf48188d1bf9aedf5d67826be8af7b41151ce5c;hp=6036a70fc12154e75c45ec7c8271c9f259f1510b;hpb=dc20dfbf1e23c58309d9d8878e6818f6f2b96bd8;p=mirror%2Fdsa-puppet.git

diff --git a/manifests/site.pp b/manifests/site.pp
index 6036a70fc..9a97d80aa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -77,121 +77,33 @@ 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,franck:   { include named::recursor }
+        bartok,franck,liszt,master,ries,samosa,schein,spohr,steffani:   { include named::recursor }
     }
 
     case $hostname {
-        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 }
+        cilea,luchesi,paganini,rautavaara: {}
+        default: {
+             case $kernel {
+                 Linux: {
+                     include ferm
+                 }
+             }
+         }
     }
+    include ferm::per-host
+
     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",
-               rule         => "&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))"
-           }
-        }
-	senfl: {
-	   @ferm::rule { "dsa-rsync":
-		    domain          => "(ip ip6)",
-		    description     => "Allow rsync access",
-		    rule            => "&SERVICE(tcp, 873)"
-	   }
-        }
-        saens,villa,lobos,raff,gluck,schein,wieck,steffani,franck: {
-           @ferm::rule { "dsa-ftp":
-		    domain          => "(ip ip6)",
-		    description     => "Allow ftp access",
-		    rule            => "&SERVICE(tcp, 21)"
-           }
-	   @ferm::rule { "dsa-rsync":
-		    domain          => "(ip ip6)",
-		    description     => "Allow rsync access",
-		    rule            => "&SERVICE(tcp, 873)"
-	   }
+        beethoven,ravel,spohr: {
+            include nfs-server
         }
-        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)"
-	   }
-        }
-	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 }
     }