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 84bccf12115c7f3d099abc439c44d25eef3b01b4..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
 
@@ -91,7 +92,7 @@ node default {
     }
 
     case $hostname {
-        powell,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: { include ferm }
     }
     case $hostname {
         zandonai,zelenka: {
@@ -152,9 +153,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,6 +168,17 @@ 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)"
+          }
+        }
 
     }
     case $brokenhosts {