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

ferm cleanup: bmdb1:wannabuild
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 04aff5667..9e6f7cfc8 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -166,14 +166,15 @@ class ferm::per_host {
 					| EOF
 			}
 			@ferm::rule { 'dsa-postgres-wannabuild':
-				# wuiet, ullmann
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 209.87.16.38/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-wannabuild6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:614:1::1274:38/128 ))'
+				description     => 'Allow postgress access to cluster: wannabuild',
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5436, (
+						${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 			@ferm::rule { 'dsa-postgres-bacula':
 				# dinis