X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=49c7baacfd3e818cdc203ca0ebf21d20f04f28ac;hb=47df1304ad8067cd1a220f80c910b61097f3a3e7;hp=900cee356e5abae9a3f0a93b2a0a0287a4c80128;hpb=fb8b2de16cb5def31c1e1486e58d39e257c8e28d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 900cee356..49c7baacf 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -1,337 +1,112 @@
 class ferm::per_host {
-	if $::hostname in [zandonai,zelenka] {
-		include ferm::zivit
-	}
+  if (getfromhash($deprecated::nodeinfo, 'hoster', 'name') == 'aql') {
+    include ferm::aql
+  }
 
-	if (getfromhash($site::nodeinfo, 'hoster', 'name') == "aql") {
-		include ferm::aql
-	}
+  case $::hostname {
+    czerny,clementi: {
+      ferm::rule { 'dsa-upsmon':
+        description => 'Allow upsmon access',
+        rule        => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
+      }
+    }
+    default: {}
+  }
 
-	case $::hostname {
-		czerny,clementi: {
-			@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: {
-			@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)',
-				description     => 'Allow hkp access',
-				rule            => '&SERVICE(tcp, 11371)'
-			}
-		}
-		gombert: {
-			@ferm::rule { 'dsa-infinoted':
-				domain          => '(ip ip6)',
-				description     => 'Allow infinoted access',
-				rule            => '&SERVICE(tcp, 6523)'
-			}
-		}
-		draghi: {
-			@ferm::rule { 'dsa-finger':
-				domain          => '(ip ip6)',
-				description     => 'Allow finger access',
-				rule            => '&SERVICE(tcp, 79)'
-			}
-			@ferm::rule { 'dsa-ldap':
-				domain          => '(ip ip6)',
-				description     => 'Allow ldap access',
-				rule            => '&SERVICE(tcp, 389)'
-			}
-			@ferm::rule { 'dsa-ldaps':
-				domain          => '(ip ip6)',
-				description     => 'Allow ldaps access',
-				rule            => '&SERVICE(tcp, 636)'
-			}
-		}
-		default: {}
-	}
+  case $::hostname {
+    bm-bl1,bm-bl2: {
+      ferm::rule { 'dsa-vrrp':
+        rule => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
+      }
+      ferm::rule { 'dsa-bind-notrack-in':
+        domain      => 'ip',
+        description => 'NOTRACK for nameserver traffic',
+        table       => 'raw',
+        chain       => 'PREROUTING',
+        rule        => 'proto (tcp udp) daddr 5.153.231.24 dport 53 jump NOTRACK'
+      }
 
-	case $::hostname {
-		bm-bl1,bm-bl2: {
-			@ferm::rule { 'dsa-vrrp':
-				rule            => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
-			}
-			@ferm::rule { 'dsa-bind-notrack-in':
-				domain      => 'ip',
-				description => 'NOTRACK for nameserver traffic',
-				table       => 'raw',
-				chain       => 'PREROUTING',
-				rule        => 'proto (tcp udp) daddr 5.153.231.24 dport 53 jump NOTRACK'
-			}
+      ferm::rule { 'dsa-bind-notrack-out':
+        domain      => 'ip',
+        description => 'NOTRACK for nameserver traffic',
+        table       => 'raw',
+        chain       => 'OUTPUT',
+        rule        => 'proto (tcp udp) saddr 5.153.231.24 sport 53 jump NOTRACK'
+      }
 
-			@ferm::rule { 'dsa-bind-notrack-out':
-				domain      => 'ip',
-				description => 'NOTRACK for nameserver traffic',
-				table       => 'raw',
-				chain       => 'OUTPUT',
-				rule        => 'proto (tcp udp) saddr 5.153.231.24 sport 53 jump NOTRACK'
-			}
+      ferm::rule { 'dsa-bind-notrack-in6':
+        domain      => 'ip6',
+        description => 'NOTRACK for nameserver traffic',
+        table       => 'raw',
+        chain       => 'PREROUTING',
+        rule        => 'proto (tcp udp) daddr 2001:41c8:1000:21::21:24 dport 53 jump NOTRACK'
+      }
 
-			@ferm::rule { 'dsa-bind-notrack-in6':
-				domain      => 'ip6',
-				description => 'NOTRACK for nameserver traffic',
-				table       => 'raw',
-				chain       => 'PREROUTING',
-				rule        => 'proto (tcp udp) daddr 2001:41c8:1000:21::21:24 dport 53 jump NOTRACK'
-			}
+      ferm::rule { 'dsa-bind-notrack-out6':
+        domain      => 'ip6',
+        description => 'NOTRACK for nameserver traffic',
+        table       => 'raw',
+        chain       => 'OUTPUT',
+        rule        => 'proto (tcp udp) saddr 2001:41c8:1000:21::21:24 sport 53 jump NOTRACK'
+      }
+    }
+    default: {}
+  }
 
-			@ferm::rule { 'dsa-bind-notrack-out6':
-				domain      => 'ip6',
-				description => 'NOTRACK for nameserver traffic',
-				table       => 'raw',
-				chain       => 'OUTPUT',
-				rule        => 'proto (tcp udp) saddr 2001:41c8:1000:21::21:24 sport 53 jump NOTRACK'
-			}
-		}
-		default: {}
-	}
-
-	# postgres stuff
-	case $::hostname {
-		ullmann: {
-			@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'), " ") }
-					))
-					| EOF
-			}
-		}
-		fasolo: {
-			@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'), " ") }
-						\$HOST_PGBACKUPHOST
-					))
-					| EOF
-			}
-		}
-		bmdb1: {
-			@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'), " ") }
-						\$HOST_PGBACKUPHOST
-					))
-					| EOF
-			}
-			@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'), " ") }
-					))
-					| EOF
-			}
-			@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'), " ") }
-						\$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, (5440), ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5440), ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-
-			@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 ))'
-			}
-
-			@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 ))'
-			}
-		}
-		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':
-				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':
-				description     => 'Allow postgress access2',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
-			}
-			@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':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-		}
-		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',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5473, ( 2001:1af8:4020:b030:deb::187/128 ))'
-			}
-		}
-		lw07: {
-			@ferm::rule { 'dsa-postgres-snapshot':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 ))'
-			}
-			@ferm::rule { 'dsa-postgres-snapshot6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
-			}
-		}
-		default: {}
-	}
-	# vpn fu
-	case $::hostname {
-		draghi: {
-			@ferm::rule { 'dsa-vpn':
-				description     => 'Allow openvpn access',
-				rule            => '&SERVICE(udp, 17257)'
-			}
-			@ferm::rule { 'dsa-routing':
-				description     => 'forward chain',
-				chain           => 'FORWARD',
-				rule            => 'policy ACCEPT;
+  # vpn fu
+  case $::hostname {
+    draghi: {
+      ferm::rule { 'dsa-vpn':
+        description => 'Allow openvpn access',
+        rule        => '&SERVICE(udp, 17257)'
+      }
+      ferm::rule { 'dsa-routing':
+        description => 'forward chain',
+        chain       => 'FORWARD',
+        rule        => 'policy ACCEPT;
 mod state state (ESTABLISHED RELATED) ACCEPT;
 interface tun+ ACCEPT;
 REJECT reject-with icmp-admin-prohibited
 '
-			}
-			@ferm::rule { 'dsa-vpn-mark':
-				table           => 'mangle',
-				chain           => 'PREROUTING',
-				rule            => 'interface tun+ MARK set-mark 1',
-			}
-			@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',
-				rule            => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))',
-			}
-		}
-		default: {}
-	}
-	# tftp
-	case $::hostname {
-		abel: {
-			@ferm::rule { 'dsa-tftp':
-				description     => 'Allow tftp access',
-				rule            => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))'
-			}
-		}
-		master: {
-			@ferm::rule { 'dsa-tftp':
-				description     => 'Allow tftp access',
-				rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))'
-			}
-		}
-	}
+      }
+      ferm::rule { 'dsa-vpn-mark':
+        table => 'mangle',
+        chain => 'PREROUTING',
+        rule  => 'interface tun+ MARK set-mark 1',
+      }
+      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-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':
+        description => 'Allow tftp access',
+        rule        => '&SERVICE_RANGE(udp, 69, ( 172.28.17.0/24 ))'
+      }
+    }
+    master: {
+      ferm::rule { 'dsa-tftp':
+        description => 'Allow tftp access',
+        rule        => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))'
+      }
+    }
+  }
 }