no more varnish on sibelius

[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 e527d3c..15c3b8b 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -60,39 +60,9 @@ class ferm::per_host {
                                rule            => '&SERVICE(tcp, 636)'
                        }
                }
-               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 209.87.16.39 ))'
-                       }
-               }
                default: {}
        }
 
-       # redirect snapshot into varnish
-       case $::hostname {
-               sibelius: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
-               lw07: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 185.17.185.185 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
-               default: {}
-       }
        case $::hostname {
                bm-bl1,bm-bl2: {
                        @ferm::rule { 'dsa-vrrp':
@@ -138,13 +108,16 @@ class ferm::per_host {
                ullmann: {
                        @ferm::rule { 'dsa-postgres-udd':
                                description     => 'Allow postgress access',
-                               # quantz, moszumanska, master, coccia
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.11/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-udd6':
-                               domain          => '(ip6)',
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
+                               domain          => '(ip ip6)',
+                               # quantz, master, coccia
+                               rule            => @(EOF)
+                                       &SERVICE_RANGE(tcp, 5452, (
+                                               5.153.231.28/32  2001:41c8:1000:21::21:28/128                   # quantz
+                                               82.195.75.110/32 2001:41b8:202:deb:216:36ff:fe40:4001/128       # master
+                                               5.153.231.11/32  2001:41c8:1000:21::21:11/128                   # coccia
+                                               5.153.231.29/32  2001:41c8:1000:21::21:29/128                   # respighi
+                                       ))
+                                       | EOF
                        }
                }
                fasolo: {
@@ -180,12 +153,12 @@ class ferm::per_host {
                        }
                        @ferm::rule { 'dsa-postgres-dak':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 209.87.16.26/32 5.153.231.21/32 5.153.231.18/32 5.153.231.29/32 128.31.0.69/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 209.87.16.26/32 5.153.231.18/32 5.153.231.29/32 128.31.0.69/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-dak6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))'
                        }
                        @ferm::rule { 'dsa-postgres-wannabuild':
                                # wuiet, ullmann
@@ -272,24 +245,24 @@ class ferm::per_host {
                                rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                }
-               sibelius: {
+               sallinen: {
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5473, ( $HOST_PGBACKUPHOST_V4 ))'
                        }
                        @ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5473, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                        @ferm::rule { 'dsa-postgres-replication':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 193.62.202.26/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5473, ( 185.17.185.187/32 ))'
                        }
                        @ferm::rule { 'dsa-postgres-replication6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 2001:630:206:4000:1a1a:0:c13e:ca1a/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5473, ( 2001:1af8:4020:b030:deb::187/128 ))'
                        }
                }
                lw07: {