Pass --force-yes when installing using apt-get

[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 575050f..1df7bdb 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',
@@ -88,17 +102,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,6 +203,12 @@ 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: {}
        }