X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=36a66373faa356789b0f1aac3037167968c00d15;hb=143d5c52a7b8f0db1908aaa7a0f2dd9dcf3badd3;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..36a66373f 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -14,7 +14,7 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}
 		}
-		lotti,lully,loghost-grnet-01: {
+		lotti,loghost-grnet-01,loghost-osuosl-01: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
 				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
@@ -116,6 +116,7 @@ class ferm::per_host {
 						${ join(getfromhash($site::allnodeinfo, 'master.debian.org', 'ipHostNumber'), " ") }
 						${ join(getfromhash($site::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
 						${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
 					))
 					| EOF
 			}
@@ -162,59 +163,51 @@ class ferm::per_host {
 						${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
 						${ join(getfromhash($site::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
 						${ join(getfromhash($site::allnodeinfo, 'usper.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
 					))
 					| 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, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ 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 ))'
-			}
-
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5436 5440), ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
+				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-dedup':
-				# ubc, wuit
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5439), ( 5.153.231.17/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-dedup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5439), ( 2001:41c8:1000:21::21:17/128 ))'
+				description     => 'Allow postgress access to cluster: dedup',
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5439, (
+						${ join(getfromhash($site::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
+					))
+					| EOF
 			}
-
 			@ferm::rule { 'dsa-postgres-debsources':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5440), ( 5.153.231.38/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-debsources6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5440), ( 2001:41c8:1000:21::21:38/128 ))'
+				description     => 'Allow postgress access to cluster: debsources',
+				domain          => '(ip ip6)',
+				rule            => @("EOF"/$)
+					&SERVICE_RANGE(tcp, 5440, (
+						${ join(getfromhash($site::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 		}
 		danzi: {
@@ -251,23 +244,16 @@ 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'), " ") }
+						${ join(getfromhash($site::allnodeinfo, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
+						\$HOST_PGBACKUPHOST
+					))
+					| EOF
 			}
 		}
 		lw07: {