X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=d41f657945e1f87316038da74f4fbdb90d340193;hb=16e295d6dcd715d959e2fad2cf0e25ba2938058e;hp=de13cb6879202c41dd6e35aa9d8a2d9b61c74b7a;hpb=c0d14d1381934a519baa3bd4b818634938e2246b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index de13cb687..d41f65794 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -18,11 +18,41 @@ class ferm::per-host {
 				rule         => '&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))'
 			}
 		}
+		ullmann: {
+			@ferm::rule { 'dsa-postgres-udd':
+				description     => 'Allow postgress access',
+				# quantz, wagner, master
+				rule            => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32 217.196.43.134/32 217.196.43.132/32 82.195.75.110/32 ))'
+			}
+			@ferm::rule { 'dsa-postgres-udd6':
+				domain          => '(ip6)',
+				description     => 'Allow postgress access',
+				# quantz
+				rule            => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 ))'
+			}
+		}
+		grieg: {
+			@ferm::rule { 'dsa-postgres-ullmann':
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.141/32 ))'
+			}
+			@ferm::rule { 'dsa-postgres-ullmann6':
+				domain          => '(ip6)',
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))'
+			}
+		}
 		danzi: {
 			@ferm::rule { 'dsa-postgres-danzi':
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 ))'
 			}
+			@ferm::rule { 'dsa-postgres-danzi6':
+				domain          => 'ip6',
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 ))'
+			}
+
 			@ferm::rule { 'dsa-postgres2-danzi':
 				description     => 'Allow postgress access2',
 				rule            => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 ))'
@@ -125,11 +155,20 @@ class ferm::per-host {
 				rule            => '&TCP_UDP_SERVICE(5080)'
 			}
 		}
-		scelsi: {
-			@ferm::rule { 'dc11-icecast':
-				domain          => '(ip ip6)',
-				description     => 'Allow icecast access',
-				rule            => '&SERVICE(tcp, 8000)'
+		unger: {
+			@ferm::rule { 'dsa-notrack-dns-diamond-in':
+				domain      => 'ip',
+				description => 'NOTRACK for nameserver traffic',
+				table       => 'raw',
+				chain       => 'PREROUTING',
+				rule        => 'destination 82.195.75.108 proto (tcp udp) dport 53 jump NOTRACK'
+			}
+			@ferm::rule { 'dsa-notrack-dns-diamond-out':
+				domain      => 'ip',
+				description => 'NOTRACK for nameserver traffic',
+				table       => 'raw',
+				chain       => 'PREROUTING',
+				rule        => 'source 82.195.75.108 proto (tcp udp) sport 53 jump NOTRACK'
 			}
 		}
 		default: {}
@@ -228,14 +267,4 @@ REJECT reject-with icmp-admin-prohibited
 		}
 		default: {}
 	}
-
-
-	# live ganeti migration
-	case $::hostname {
-		tristano: { @ferm::rule { 'dsa-ganeti-migrate': rule => 'interface br1 proto tcp dport 8102 src 192.168.2.217 ACCEPT'; } }
-		pasquini: { @ferm::rule { 'dsa-ganeti-migrate': rule => 'interface br1 proto tcp dport 8102 src 192.168.2.213 ACCEPT'; } }
-		bertali:  { @ferm::rule { 'dsa-ganeti-migrate': rule => 'interface br1 proto tcp dport 8102 src 192.168.2.216 ACCEPT'; } }
-		boito:    { @ferm::rule { 'dsa-ganeti-migrate': rule => 'interface br1 proto tcp dport 8102 src 192.168.2.212 ACCEPT'; } }
-		default: {}
-	}
 }