X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=fb38cb3fd7b0878600fec388aed0863a25f57170;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=d48793620b8f74b2771d1d2b2534d8efdd72b383;hpb=8c54c329a260972d770be7087bfeb235b978cbf4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index d48793620..fb38cb3fd 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -3,58 +3,43 @@ class ferm::per_host {
 		include ferm::zivit
 	}
 
-	if (getfromhash($site::nodeinfo, 'hoster', 'name') == "aql") {
+	if (getfromhash($deprecated::nodeinfo, 'hoster', 'name') == "aql") {
 		include ferm::aql
 	}
 
 	case $::hostname {
 		czerny,clementi: {
-			@ferm::rule { 'dsa-upsmon':
+			ferm::rule { 'dsa-upsmon':
 				description     => 'Allow upsmon access',
 				rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}
 		}
-		lotti,lully,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':
+			ferm::rule { 'dsa-hkp':
 				domain          => '(ip ip6)',
 				description     => 'Allow hkp access',
 				rule            => '&SERVICE(tcp, 11371)'
 			}
 		}
 		gombert: {
-			@ferm::rule { 'dsa-infinoted':
+			ferm::rule { 'dsa-infinoted':
 				domain          => '(ip ip6)',
 				description     => 'Allow infinoted access',
 				rule            => '&SERVICE(tcp, 6523)'
 			}
 		}
 		draghi: {
-			@ferm::rule { 'dsa-finger':
+			ferm::rule { 'dsa-finger':
 				domain          => '(ip ip6)',
 				description     => 'Allow finger access',
 				rule            => '&SERVICE(tcp, 79)'
 			}
-			@ferm::rule { 'dsa-ldap':
+			ferm::rule { 'dsa-ldap':
 				domain          => '(ip ip6)',
 				description     => 'Allow ldap access',
 				rule            => '&SERVICE(tcp, 389)'
 			}
-			@ferm::rule { 'dsa-ldaps':
+			ferm::rule { 'dsa-ldaps':
 				domain          => '(ip ip6)',
 				description     => 'Allow ldaps access',
 				rule            => '&SERVICE(tcp, 636)'
@@ -65,10 +50,10 @@ class ferm::per_host {
 
 	case $::hostname {
 		bm-bl1,bm-bl2: {
-			@ferm::rule { 'dsa-vrrp':
+			ferm::rule { 'dsa-vrrp':
 				rule            => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
 			}
-			@ferm::rule { 'dsa-bind-notrack-in':
+			ferm::rule { 'dsa-bind-notrack-in':
 				domain      => 'ip',
 				description => 'NOTRACK for nameserver traffic',
 				table       => 'raw',
@@ -76,7 +61,7 @@ class ferm::per_host {
 				rule        => 'proto (tcp udp) daddr 5.153.231.24 dport 53 jump NOTRACK'
 			}
 
-			@ferm::rule { 'dsa-bind-notrack-out':
+			ferm::rule { 'dsa-bind-notrack-out':
 				domain      => 'ip',
 				description => 'NOTRACK for nameserver traffic',
 				table       => 'raw',
@@ -84,7 +69,7 @@ class ferm::per_host {
 				rule        => 'proto (tcp udp) saddr 5.153.231.24 sport 53 jump NOTRACK'
 			}
 
-			@ferm::rule { 'dsa-bind-notrack-in6':
+			ferm::rule { 'dsa-bind-notrack-in6':
 				domain      => 'ip6',
 				description => 'NOTRACK for nameserver traffic',
 				table       => 'raw',
@@ -92,7 +77,7 @@ class ferm::per_host {
 				rule        => 'proto (tcp udp) daddr 2001:41c8:1000:21::21:24 dport 53 jump NOTRACK'
 			}
 
-			@ferm::rule { 'dsa-bind-notrack-out6':
+			ferm::rule { 'dsa-bind-notrack-out6':
 				domain      => 'ip6',
 				description => 'NOTRACK for nameserver traffic',
 				table       => 'raw',
@@ -106,173 +91,183 @@ class ferm::per_host {
 	# postgres stuff
 	case $::hostname {
 		ullmann: {
-			@ferm::rule { 'dsa-postgres-udd':
+			ferm::rule { 'dsa-postgres-udd':
 				description     => 'Allow postgress access',
 				domain          => '(ip ip6)',
 				# quantz, master, coccia
 				rule            => @("EOF")
 					&SERVICE_RANGE(tcp, 5452, (
-						${ join(getfromhash($site::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-						${ 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($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'master.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
 					))
 					| EOF
 			}
 		}
 		fasolo: {
-			@ferm::rule { 'dsa-postgres':
+			ferm::rule { 'dsa-postgres':
 				description     => 'Allow postgress access',
 				domain          => '(ip ip6)',
 				rule            => @("EOF"/$)
 					&SERVICE_RANGE(tcp, 5433, (
-						${ join(getfromhash($site::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'bmdb1.debian.org', 'ipHostNumber'), " ") }
 						\$HOST_PGBACKUPHOST
 					))
 					| EOF
 			}
 		}
 		bmdb1: {
-			@ferm::rule { 'dsa-postgres-main':
+			ferm::rule { 'dsa-postgres-main':
 				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'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'ticharich.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'petrova.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'rusca.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'tate.debian.org', 'ipHostNumber'), " ") }
 						\$HOST_PGBACKUPHOST
 					))
 					| EOF
 			}
-			@ferm::rule { 'dsa-postgres-dak':
+			ferm::rule { 'dsa-postgres-dak':
 				description     => 'Allow postgress access to cluster: dak',
 				domain          => '(ip ip6)',
 				rule            => @("EOF"/$)
 					&SERVICE_RANGE(tcp, 5434, (
-						${ join(getfromhash($site::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
-						${ join(getfromhash($site::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
-						${ join(getfromhash($site::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
-						${ 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($deprecated::allnodeinfo, 'coccia.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'quantz.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'nono.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'usper.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
 					))
 					| EOF
 			}
-			@ferm::rule { 'dsa-postgres-wannabuild':
+			ferm::rule { 'dsa-postgres-wannabuild':
 				description     => 'Allow postgress access to cluster: wannabuild',
 				domain          => '(ip ip6)',
 				rule            => @("EOF"/$)
 					&SERVICE_RANGE(tcp, 5436, (
-						${ join(getfromhash($site::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
-						${ join(getfromhash($site::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'respighi.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'wuiet.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'ullmann.debian.org', 'ipHostNumber'), " ") }
 						\$HOST_PGBACKUPHOST
 					))
 					| EOF
 			}
-			@ferm::rule { 'dsa-postgres-bacula':
+			ferm::rule { 'dsa-postgres-bacula':
 				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'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'dinis.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'storace.debian.org', 'ipHostNumber'), " ") }
 						\$HOST_PGBACKUPHOST
 					))
 					| EOF
 			}
-			@ferm::rule { 'dsa-postgres-dedup':
+			ferm::rule { 'dsa-postgres-dedup':
 				description     => 'Allow postgress access to cluster: dedup',
 				domain          => '(ip ip6)',
 				rule            => @("EOF"/$)
 					&SERVICE_RANGE(tcp, 5439, (
-						${ join(getfromhash($site::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'delfin.debian.org', 'ipHostNumber'), " ") }
 					))
 					| EOF
 			}
-			@ferm::rule { 'dsa-postgres-debsources':
+			ferm::rule { 'dsa-postgres-debsources':
 				description     => 'Allow postgress access to cluster: debsources',
 				domain          => '(ip ip6)',
 				rule            => @("EOF"/$)
 					&SERVICE_RANGE(tcp, 5440, (
-						${ join(getfromhash($site::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'sor.debian.org', 'ipHostNumber'), " ") }
 						\$HOST_PGBACKUPHOST
 					))
 					| EOF
 			}
 		}
 		danzi: {
-			@ferm::rule { 'dsa-postgres-danzi':
+			ferm::rule { 'dsa-postgres-danzi':
 				# ubc, wuiet
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 209.87.16.0/24 5.153.231.18/32 ))'
 			}
-			@ferm::rule { 'dsa-postgres-danzi6':
+			ferm::rule { 'dsa-postgres-danzi6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2607:f8f0:614:1::/64 2001:41c8:1000:21::21:18/128 ))'
 			}
 
-			@ferm::rule { 'dsa-postgres2-danzi':
+			ferm::rule { 'dsa-postgres2-danzi':
 				description     => 'Allow postgress access2',
 				rule            => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
 			}
-			@ferm::rule { 'dsa-postgres2-danzi6':
+			ferm::rule { 'dsa-postgres2-danzi6':
 				domain		=> 'ip6',
 				description     => 'Allow postgress access2',
 				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
 			}
 		}
 		seger: {
-			@ferm::rule { 'dsa-postgres-backup':
+			ferm::rule { 'dsa-postgres-backup':
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
 			}
-			@ferm::rule { 'dsa-postgres-backup6':
+			ferm::rule { 'dsa-postgres-backup6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
 			}
 		}
 		sallinen: {
-			@ferm::rule { 'dsa-postgres':
+			ferm::rule { 'dsa-postgres':
 				description     => 'Allow postgress access',
 				domain          => '(ip ip6)',
 				rule            => @("EOF"/$)
 					&SERVICE_RANGE(tcp, 5473, (
-						${ join(getfromhash($site::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'lw07.debian.org', 'ipHostNumber'), " ") }
+						${ join(getfromhash($deprecated::allnodeinfo, 'snapshotdb-manda-01.debian.org', 'ipHostNumber'), " ") }
 						\$HOST_PGBACKUPHOST
 					))
 					| EOF
 			}
 		}
 		lw07: {
-			@ferm::rule { 'dsa-postgres-snapshot':
+			ferm::rule { 'dsa-postgres-snapshot':
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 ))'
 			}
-			@ferm::rule { 'dsa-postgres-snapshot6':
+			ferm::rule { 'dsa-postgres-snapshot6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
 				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
 	case $::hostname {
 		draghi: {
-			@ferm::rule { 'dsa-vpn':
+			ferm::rule { 'dsa-vpn':
 				description     => 'Allow openvpn access',
 				rule            => '&SERVICE(udp, 17257)'
 			}
-			@ferm::rule { 'dsa-routing':
+			ferm::rule { 'dsa-routing':
 				description     => 'forward chain',
 				chain           => 'FORWARD',
 				rule            => 'policy ACCEPT;
@@ -281,35 +276,41 @@ interface tun+ ACCEPT;
 REJECT reject-with icmp-admin-prohibited
 '
 			}
-			@ferm::rule { 'dsa-vpn-mark':
+			ferm::rule { 'dsa-vpn-mark':
 				table           => 'mangle',
 				chain           => 'PREROUTING',
 				rule            => 'interface tun+ MARK set-mark 1',
 			}
-			@ferm::rule { 'dsa-vpn-nat':
+			ferm::rule { 'dsa-vpn-nat':
 				table           => 'nat',
 				chain           => 'POSTROUTING',
 				rule            => 'outerface !tun+ mod mark mark 1 MASQUERADE',
 			}
 		}
 		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
 	case $::hostname {
 		abel: {
-			@ferm::rule { 'dsa-tftp':
+			ferm::rule { 'dsa-tftp':
 				description     => 'Allow tftp access',
 				rule            => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))'
 			}
 		}
 		master: {
-			@ferm::rule { 'dsa-tftp':
+			ferm::rule { 'dsa-tftp':
 				description     => 'Allow tftp access',
 				rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}