fix danzi-dinis v6 rule

[mirror/dsa-puppet.git] / modules / ferm / manifests / per-host.pp

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 953ea65..8e43df6 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,7 +3,7 @@ class ferm::per-host {
                include ferm::zivit
        }
 
-       if $::hostname in [glinka,klecker,merikanto,powell,ravel,rietz,senfl,sibelius,stabile] {
+       if $::hostname in [glinka,klecker,merikanto,ravel,rietz,senfl,sibelius,stabile] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',
@@ -48,6 +48,20 @@ class ferm::per-host {
                                rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
                        }
                }
+               bendel: {
+                       @ferm::rule { 'listmaster-ontp-in':
+                               description     => 'ONTP has a broken mail setup',
+                               table           => 'filter',
+                               chain           => 'INPUT',
+                               rule            => 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
+                       }
+                       @ferm::rule { 'listmaster-ontp-out':
+                               description     => 'ONTP has a broken mail setup',
+                               table           => 'filter',
+                               chain           => 'OUTPUT',
+                               rule            => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
+                       }
+               }
                danzi: {
                        @ferm::rule { 'dsa-postgres-danzi':
                                description     => 'Allow postgress access',
@@ -71,6 +85,16 @@ class ferm::per-host {
                                description     => 'Allow postgress access4',
                                rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))'
                        }
+
+                       @ferm::rule { 'dsa-postgres-bacula-danzi':
+                               description     => 'Allow postgress access1',
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 206.12.19.139/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-bacula-danzi6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access1',
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:610:4000:6564:a62:ce0c:138b/128 ))'
+                       }
                }
                abel,alwyn,rietz: {
                        @ferm::rule { 'dsa-tftp':
@@ -88,17 +112,6 @@ class ferm::per-host {
                                rule            => '&SERVICE(udp, 69)'
                        }
                }
-               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'
-                       }
-               }
                lotti,lully: {
                        @ferm::rule { 'dsa-syslog':
                                description     => 'Allow syslog access',
@@ -200,10 +213,16 @@ REJECT reject-with icmp-admin-prohibited
                                rule        => 'source 82.195.75.108 proto (tcp udp) sport 53 jump NOTRACK'
                        }
                }
+               sonntag: {
+                       @ferm::rule { 'dsa-bugs-search':
+                               description  => 'port 1978 for bugs-search from bug web frontends',
+                               rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 206.12.19.140 ))'
+                       }
+               }
                default: {}
        }
 
-       if $::hostname in [rautavaara,luchesi] {
+       if $::hostname in [rautavaara] {
                @ferm::rule { 'dsa-to-kfreebsd':
                        description     => 'Traffic routed to kfreebsd hosts',
                        chain           => 'to-kfreebsd',
@@ -243,29 +262,6 @@ interface vlan11 outerface eth0 jump from-kfreebsd;
 interface eth0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
 ULOG ulog-prefix "REJECT FORWARD: ";
 REJECT reject-with icmp-admin-prohibited
-'
-                       }
-               }
-               luchesi: {
-                       @ferm::rule { 'dsa-routing':
-                               description     => 'forward chain',
-                               chain           => 'FORWARD',
-                               rule            => 'def $ADDRESS_FANO=206.12.19.110;
-def $ADDRESS_FINZI=206.12.19.111;
-def $ADDRESS_FISCHER=206.12.19.112;
-def $ADDRESS_FALLA=206.12.19.117;
-def $FREEBSD_HOSTS=($ADDRESS_FANO $ADDRESS_FINZI $ADDRESS_FISCHER $ADDRESS_FALLA);
-
-policy ACCEPT;
-mod state state (ESTABLISHED RELATED) ACCEPT;
-interface br0 outerface br0 ACCEPT;
-interface br1 outerface br1 ACCEPT;
-
-interface br2 outerface br0 jump from-kfreebsd;
-interface br0 destination ($ADDRESS_FISCHER $ADDRESS_FALLA) proto tcp dport 22 ACCEPT;
-interface br0 destination ($FREEBSD_HOSTS) jump to-kfreebsd;
-ULOG ulog-prefix "REJECT FORWARD: ";
-REJECT reject-with icmp-admin-prohibited
 '
                        }
                }
@@ -297,10 +293,21 @@ REJECT reject-with icmp-admin-prohibited
                default: {}
        }
        case $::hostname {
-               bm-bl1,bm-bl9: {
+               bm-bl1,bm-bl2: {
                        @ferm::rule { 'dsa-vrrp':
                                rule            => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
                        }
+                       @ferm::rule { 'dsa-conntrackd':
+                               rule            => 'interface vlan2 daddr 225.0.0.50 jump ACCEPT',
+                       }
+               }
+               default: {}
+       }
+       case $::hostname {
+               bm-bl1,bm-bl2,bm-bl3,bm-bl4,bm-bl5,bm-bl6,bm-bl7,bm-bl8,bm-bl9,bm-bl10,bm-bl11,bm-bl12,bm-bl13,bm-bl14: {
+                       @ferm::rule { 'dsa-hwnet-vlan20':
+                               rule            => 'interface vlan20 jump ACCEPT',
+                       }
                }
                default: {}
        }