X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=5e1f835ca148d034b0c7316b53c1907f06043906;hb=b77282b8c52490555cc69902f71838a7183220af;hp=9f05f96fdbf262c3591219b7f1472d1d4de9376e;hpb=1a5f0ac7c3746a07e35d66b65625c8d1299b0cc2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 9f05f96fd..5e1f835ca 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -121,35 +121,35 @@ class ferm::per_host {
 			}
 		}
 		fasolo: {
-			@ferm::rule { 'dsa-postgres-fasolo':
+			@ferm::rule { 'dsa-postgres':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 5.153.231.10/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-fasolo6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:10/128 ))'
-			}
-
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5433, (
+						${ join(getfromhash($site::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 		}
 		bmdb1: {
 			@ferm::rule { 'dsa-postgres-main':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.23/32 5.153.231.25/32 209.87.16.38/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32 5.153.231.43/32 5.153.231.33/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-main6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:614:1::1274:38/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128 2001:41c8:1000:21::21:43/128 2001:41c8:1000:21::21:33/128 ))'
+				description     => 'Allow postgress access to cluster: main',
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5435, (
+						${ join(getfromhash($site::allnodeinfo, 'ticharich.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'petrova.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'olin.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'rusca.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'tate.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 			@ferm::rule { 'dsa-postgres-dak':
 				description     => 'Allow postgress access',
@@ -183,12 +183,12 @@ class ferm::per_host {
 
 			@ferm::rule { 'dsa-postgres-backup':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V4 ))'
+				rule            => '&SERVICE_RANGE(tcp, (5436 5440), ( $HOST_PGBACKUPHOST_V4 ))'
 			}
 			@ferm::rule { 'dsa-postgres-backup6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
+				rule            => '&SERVICE_RANGE(tcp, (5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
 			}
 
 			@ferm::rule { 'dsa-postgres-dedup':