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

ferm cleanup: sallinen
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 4db32d31c..19086823b 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -241,23 +241,15 @@ class ferm::per_host {
 			}
 		}
 		sallinen: {
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5473, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5473, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-			@ferm::rule { 'dsa-postgres-replication':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5473, ( 185.17.185.187/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-replication6':
-				domain          => 'ip6',
+			@ferm::rule { 'dsa-postgres':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5473, ( 2001:1af8:4020:b030:deb::187/128 ))'
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5473, (
+						${ join(getfromhash($site::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 		}
 		lw07: {