X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=2bc1944fd694514edd998893ae1c7062f5c07460;hb=73a1101af147b2d6d023f436dd4422b6b037a1c0;hp=19086823b86241659cb4d002d523eda34456fda5;hpb=d3aa887af37def8fcfe5ae100c4f9e7203c6f8bc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 19086823b..2bc1944fd 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,6 +163,7 @@ 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
 			}
@@ -170,6 +172,7 @@ class ferm::per_host {
 				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
@@ -247,6 +250,7 @@ class ferm::per_host {
 				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
@@ -263,6 +267,13 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
 			}
 		}
+		snapshotdb-manda-01: {
+			@ferm::rule { 'dsa-postgres-snapshot':
+				domain          => '(ip ip6)',
+				description     => 'Allow postgress access from leaseweb (lw07 and friends)',
+				rule            => '&SERVICE_RANGE(tcp, 5442, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))'
+			}
+		}
 		default: {}
 	}
 	# vpn fu