X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=725fc6d260171e2c3609eb4da5219b2caf158dda;hb=86be210c825f8b9709e3bd9353c469949d918fda;hp=07269c89e99d4462d581d127ff0cda36aaa6738b;hpb=305cb4161ca530fff3466116190620807edfebec;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 07269c89e..725fc6d26 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -116,22 +116,6 @@ class ferm::per-host {
 				rule            => '&TCP_UDP_SERVICE(5080)'
 			}
 		}
-		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'
-			}
-		}
 		sonntag: {
 			@ferm::rule { 'dsa-bugs-search':
 				description  => 'port 1978 for bugs-search from bug web frontends',
@@ -209,7 +193,7 @@ class ferm::per-host {
 				rule            => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 ))'
 			}
 		}
-		grieg,wuiet: {
+		grieg: {
 			@ferm::rule { 'dsa-postgres-ullmann':
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.141/32 ))'
@@ -251,24 +235,36 @@ class ferm::per-host {
 				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2607:f8f0:610:4000:6564:a62:ce0c:1386/128 ))'
 			}
 			@ferm::rule { 'dsa-postgres-wanna-build':
+				# wuiet, ullmann, franck
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.18/32 206.12.19.141/32 138.16.160.12/32 ))'
 			}
 			@ferm::rule { 'dsa-postgres-wanna-build6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:18/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 ))'
+			}
+			@ferm::rule { 'dsa-postgres-bacula':
+				# dinis
+				description     => 'Allow postgress access1',
+				rule            => '&SERVICE_RANGE(tcp, 5437, ( 5.153.231.19/32 ))'
+			}
+			@ferm::rule { 'dsa-postgres-bacula6':
+				domain          => 'ip6',
+				description     => 'Allow postgress access1',
+				rule            => '&SERVICE_RANGE(tcp, 5437, ( 2001:41c8:1000:21::21:19/128 ))'
 			}
 		}
 		danzi: {
 			@ferm::rule { 'dsa-postgres-danzi':
+				# ubc, wuit
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 194.177.211.200/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.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 2001:648:2ffc:deb:214:22ff:fe74:1fa/128 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2607:f8f0:610:4000::/64 2001:41c8:1000:21::21:18/128 ))'
 			}
 
 			@ferm::rule { 'dsa-postgres2-danzi':
@@ -284,15 +280,6 @@ class ferm::per-host {
 				rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 ))'
 			}
 
-			@ferm::rule { 'dsa-postgres-bacula-danzi':
-				description     => 'Allow postgress access1',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( 206.12.19.139/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-bacula-danzi6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access1',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:610:4000:6564:a62:ce0c:138b/128 ))'
-			}
 		}
 	}
 	# vpn fu