X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=1ba00ad7682baa6f262173d9890cc48493449add;hb=6be7af70c0c4819516308a9a01ed9d5860563a6c;hp=01e9cdaf124ffe6f64bd52bfcf0d1129dcad4cdd;hpb=e764ff0ec7eaccac713c15cb4c3fb284649b850b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 01e9cdaf1..1ba00ad76 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -66,12 +66,6 @@ class ferm::per_host {
 				rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 209.87.16.39 ))'
 			}
 		}
-		vittoria: {
-			@ferm::rule { 'debconf18':
-				description	=> 'temporarily allow DC18 access',
-				rule		=> '&SERVICE_RANGE(tcp, 5432, ( 140.113.6.241/32 140.110.240.4/32 ))'
-			}
-		}
 		default: {}
 	}
 
@@ -134,13 +128,16 @@ class ferm::per_host {
 		ullmann: {
 			@ferm::rule { 'dsa-postgres-udd':
 				description     => 'Allow postgress access',
-				# quantz, moszumanska, master, coccia
-				rule            => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 5.153.231.21/32 82.195.75.110/32 5.153.231.11/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-udd6':
-				domain          => '(ip6)',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 2001:41c8:1000:21::21:21/128 ))'
+				domain          => '(ip ip6)',
+				# quantz, master, coccia
+				rule            => @(EOF)
+					&SERVICE_RANGE(tcp, 5452, (
+						5.153.231.28/32  2001:41c8:1000:21::21:28/128			# quantz
+						82.195.75.110/32 2001:41b8:202:deb:216:36ff:fe40:4001/128	# master
+						5.153.231.11/32  2001:41c8:1000:21::21:11/128			# coccia
+						5.153.231.29/32  2001:41c8:1000:21::21:29/128			# respighi
+					))
+					| EOF
 			}
 		}
 		fasolo: {
@@ -176,12 +173,12 @@ class ferm::per_host {
 			}
 			@ferm::rule { 'dsa-postgres-dak':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 209.87.16.26/32 5.153.231.21/32 5.153.231.18/32 5.153.231.29/32 128.31.0.69/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 209.87.16.26/32 5.153.231.18/32 5.153.231.29/32 128.31.0.69/32 ))'
 			}
 			@ferm::rule { 'dsa-postgres-dak6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:614:1::1274:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:29/128 ))'
 			}
 			@ferm::rule { 'dsa-postgres-wannabuild':
 				# wuiet, ullmann
@@ -268,26 +265,6 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
 			}
 		}
-		sibelius: {
-			@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 ))'
-			}
-			@ferm::rule { 'dsa-postgres-replication':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 193.62.202.26/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-replication6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 2001:630:206:4000:1a1a:0:c13e:ca1a/128 ))'
-			}
-		}
 		sallinen: {
 			@ferm::rule { 'dsa-postgres-backup':
 				description     => 'Allow postgress access',