X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=ee1a6656d500ed3461f7cac0b25713f9d6e3c06f;hb=a460997ef6acddc28b6342a2ff615f17ba0b8b2b;hp=307ef87384a88ca321d206f6eb149168852df808;hpb=93481f49de29f36f8116229d46f4d29e452af8f5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 307ef8738..ee1a6656d 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -14,21 +14,6 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}
 		}
-		lotti,loghost-grnet-01,loghost-osuosl-01: {
-			@ferm::rule { 'dsa-syslog':
-				description     => 'Allow syslog access',
-				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V4)'
-			}
-			@ferm::rule { 'dsa-syslog-v6':
-				domain          => 'ip6',
-				description     => 'Allow syslog access',
-				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V6)'
-			}
-			@ferm::rule { 'fastly-syslog':
-				description     => 'Allow syslog access',
-				rule            => '&SERVICE_RANGE(tcp, 5141, $HOST_FASTLY)'
-			}
-		}
 		kaufmann: {
 			@ferm::rule { 'dsa-hkp':
 				domain          => '(ip ip6)',
@@ -142,7 +127,6 @@ class ferm::per_host {
 						${ 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'), " ") }
@@ -250,6 +234,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
@@ -266,6 +251,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
@@ -296,11 +288,17 @@ REJECT reject-with icmp-admin-prohibited
 			}
 		}
 		ubc-enc2bl01,ubc-enc2bl02,ubc-enc2bl09,ubc-enc2bl10: {
-			@ferm::rule { 'dsa-luca-fixme':
-				description     => 'Allow ssh access from mnt and vpn networks',
+			@ferm::rule { 'dsa-ssh-priv':
+				description     => 'Allow ssh access',
 				rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))',
 			}
 		}
+		ubc-node-arm01,ubc-node-arm02,ubc-node-arm03: {
+			@ferm::rule { 'dsa-ssh-priv':
+				description     => 'Allow ssh access',
+				rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.43.240 ))',
+			}
+		}
 		default: {}
 	}
 	# tftp