ferm: allow debsources access

[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 76e77a31dc8fda6197893325bc2e5f7e95435625..21ff820c48787c330e578031677c064aec5145cb 100644 (file)
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -141,24 +141,6 @@ class ferm::per-host {
                default: {}
        }
 
-       if $::hostname in [rautavaara] {
-               @ferm::rule { 'dsa-from-mgmt':
-                       description     => 'Traffic routed from mgmt net vlan/bridge',
-                       chain           => 'INPUT',
-                       rule            => 'interface eth1 ACCEPT'
-               }
-               @ferm::rule { 'dsa-mgmt-mark':
-                       table           => 'mangle',
-                       chain           => 'PREROUTING',
-                       rule            => 'interface eth1 MARK set-mark 1',
-               }
-               @ferm::rule { 'dsa-mgmt-nat':
-                       table           => 'nat',
-                       chain           => 'POSTROUTING',
-                       rule            => 'outerface eth1 mod mark mark 1 MASQUERADE',
-               }
-       }
-
        # redirect snapshot into varnish
        case $::hostname {
                sibelius: {
@@ -263,12 +245,12 @@ class ferm::per-host {
 
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
                        }
                        @ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                }
                bmdb1: {
@@ -324,12 +306,12 @@ class ferm::per-host {
                        @ferm::rule { 'dsa-postgres-backup':
                                # ubc, wuit
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( 5.153.231.12/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V4 ))'
                        }
                        @ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( 2001:41c8:1000:21::21:12/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V6 ))'
                        }
 
                        @ferm::rule { 'dsa-postgres-dedup':
@@ -342,6 +324,16 @@ class ferm::per-host {
                                description     => 'Allow postgress access',
                                rule            => '&SERVICE_RANGE(tcp, (5439), ( 2001:41c8:1000:21::21:17/128 ))'
                        }
+
+                       @ferm::rule { 'dsa-postgres-debsources':
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, (5440), ( 5.153.231.38/32 ))'
+                       }
+                       @ferm::rule { 'dsa-postgres-debsources6':
+                               domain          => 'ip6',
+                               description     => 'Allow postgress access',
+                               rule            => '&SERVICE_RANGE(tcp, (5440), ( 2001:41c8:1000:21::21:38/128 ))'
+                       }
                }
                danzi: {
                        @ferm::rule { 'dsa-postgres-danzi':
@@ -370,34 +362,34 @@ class ferm::per-host {
 
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
                        }
                        @ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                }
                chopin: {
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5432, ( 5.153.231.12/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
                        }
                        @ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5432, ( 2001:41c8:1000:21::21:12/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                }
                sibelius: {
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.12/32 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
                        }
                        @ferm::rule { 'dsa-postgres-backup6':
                                domain          => 'ip6',
                                description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
+                               rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
                        }
                        @ferm::rule { 'dsa-postgres-replication':
                                description     => 'Allow postgress access',