X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=bd270c9260a26e544ce8437954ba7567a5b184ec;hb=eedd9b7a5e400500547a9e40bb9bd2e415dfb701;hp=04aff5667f4147a71e65a9d010acd6b0b16b9b41;hpb=f7b86f238564ce27e771a2e9a07ac63c98c13be2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 04aff5667..bd270c926 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -166,34 +166,36 @@ 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
-				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':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5436 5440), ( $HOST_PGBACKUPHOST_V4 ))'
+				rule            => '&SERVICE_RANGE(tcp, (5440), ( $HOST_PGBACKUPHOST_V4 ))'
 			}
 			@ferm::rule { 'dsa-postgres-backup6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
+				rule            => '&SERVICE_RANGE(tcp, (5440), ( $HOST_PGBACKUPHOST_V6 ))'
 			}
 
 			@ferm::rule { 'dsa-postgres-dedup':