ferm cleanup: bmdb1:dedup

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index bd270c9..624216a 100644 (file)
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -187,6 +187,15 @@ class ferm::per_host {
                                        ))
                                        | EOF
                        }
+                       @ferm::rule { 'dsa-postgres-dedup':
+                               description     => 'Allow postgress access to cluster: dedup',
+                               domain          => '(ip ip6)',
+                               rule            => @("EOF"/$)
+                                       &SERVICE_RANGE(tcp, 5439, (
+                                               ${ join(getfromhash($site::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
+                                       ))
+                                       | EOF
+                       }
 
                        @ferm::rule { 'dsa-postgres-backup':
                                description     => 'Allow postgress access',
@@ -198,17 +207,6 @@ class ferm::per_host {
                                rule            => '&SERVICE_RANGE(tcp, (5440), ( $HOST_PGBACKUPHOST_V6 ))'
                        }
 
-                       @ferm::rule { 'dsa-postgres-dedup':
-                               # ubc, wuit
-                               description     => 'Allow postgress access',
-                               rule            => '&SERVICE_RANGE(tcp, (5439), ( 5.153.231.17/32 ))'
-                       }
-                       @ferm::rule { 'dsa-postgres-dedup6':
-                               domain          => 'ip6',
-                               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 ))'