Allow pg connections from pgbackuphost

[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 b7312c5c9155ce3a1aa3c09035c5a22a104101f8..e7016c8960dcc4f59317aad6e1ff4204c8c29981 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,ravel,rietz,senfl,sibelius,stabile] {
+       if $::hostname in [glinka,klecker,ravel,rietz,senfl,sibelius] {
                ferm::rule { 'dsa-rsync':
                        domain      => '(ip ip6)',
                        description => 'Allow rsync access',
@@ -90,7 +90,7 @@ class ferm::per-host {
                                rule        => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
                        }
                }
-               lotti,lully: {
+               lotti,lully,loghost-grnet-01: {
                        @ferm::rule { 'dsa-syslog':
                                description     => 'Allow syslog access',
                                rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
@@ -171,16 +171,6 @@ class ferm::per-host {
                                rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
                        }
                }
-               stabile: {
-                       @ferm::rule { 'dsa-snapshot-varnish':
-                               rule            => '&SERVICE(tcp, 6081)',
-                       }
-                       @ferm::rule { 'dsa-nat-snapshot-varnish':
-                               table           => 'nat',
-                               chain           => 'PREROUTING',
-                               rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
-                       }
-               }
                lw07: {
                        @ferm::rule { 'dsa-snapshot-varnish':
                                rule            => '&SERVICE(tcp, 6081)',
@@ -273,12 +263,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: {
@@ -334,12 +324,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':
@@ -380,34 +370,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',