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

ferm cleanup: bmdb1:bacula
---

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 900cee356..bd270c926 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -177,14 +177,15 @@ class ferm::per_host {
 					| EOF
 			}
 			@ferm::rule { 'dsa-postgres-bacula':
-				# dinis
-				description     => 'Allow postgress access1',
-				rule            => '&SERVICE_RANGE(tcp, 5437, ( 5.153.231.19/32 93.94.130.161/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-bacula6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access1',
-				rule            => '&SERVICE_RANGE(tcp, 5437, ( 2001:41c8:1000:21::21:19/128 2a02:158:380:280::161/128 ))'
+				description     => 'Allow postgress access to cluster: bacula',
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5437, (
+						${ join(getfromhash($site::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 
 			@ferm::rule { 'dsa-postgres-backup':