Make ferm list exclusive rather than inclusive

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

diff --git a/manifests/site.pp b/manifests/site.pp
index 84bccf12115c7f3d099abc439c44d25eef3b01b4..13b0ddfb5e158bfc420e1e963835443f04c4b983 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
 
@@ -87,14 +88,22 @@ 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,ries,franck,liszt:   { include named::recursor }
     }
 
     case $hostname {
-        powell,logtest01,geo1,geo2,geo3,bartok,senfl,beethoven,piatti,saens,villa,lobos,raff,gluck,schein,wieck,steffani,ball,handel,tchaikovsky: { include ferm }
+        bellini,cilea,cimarosa,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 ))"
@@ -103,6 +112,10 @@ node default {
                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":
@@ -117,7 +130,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",
@@ -129,12 +142,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",
@@ -152,9 +159,14 @@ node default {
                    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":
@@ -162,7 +174,36 @@ node 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 }