From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 13 Nov 2018 12:54:21 +0000 (+0100)
Subject: ferm cleanup: bmdb1:debsources
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1d134cd5311781937d493a007cf714f82de91e73;p=mirror%2Fdsa-puppet.git

ferm cleanup: bmdb1:debsources
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 624216a6e..c11373051 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -196,25 +196,15 @@ class ferm::per_host {
 					))
 					| EOF
 			}
-
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5440), ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5440), ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-
 			@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 ))'
+				description     => 'Allow postgress access to cluster: debsources',
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5437, (
+						${ join(getfromhash($site::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 		}
 		danzi: {