X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=7164206c2a1acf7fd86a0ff43daead3d313fe4e8;hb=f9cd82915b4f9db0e26a33578dfe021acf0a5655;hp=388048ea31478567ba5479489a9ed227049f50ea;hpb=933244a276b3326e8b5701601af15f831c0adf32;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 388048ea3..7164206c2 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -179,6 +179,26 @@ class ferm::per-host {
 				rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
 			}
 		}
+		lw05: {
+			@ferm::rule { 'dsa-snapshot-varnish':
+				rule            => '&SERVICE(tcp, 6081)',
+			}
+			@ferm::rule { 'dsa-nat-snapshot-varnish':
+				table           => 'nat',
+				chain           => 'PREROUTING',
+				rule            => 'proto tcp daddr 185.17.185.181 dport 80 REDIRECT to-ports 6081',
+			}
+		}
+		lw06: {
+			@ferm::rule { 'dsa-snapshot-varnish':
+				rule            => '&SERVICE(tcp, 6081)',
+			}
+			@ferm::rule { 'dsa-nat-snapshot-varnish':
+				table           => 'nat',
+				chain           => 'PREROUTING',
+				rule            => 'proto tcp daddr 185.17.185.182 dport 80 REDIRECT to-ports 6081',
+			}
+		}
 		default: {}
 	}
 	case $::hostname {
@@ -272,12 +292,12 @@ class ferm::per-host {
 		bmdb1: {
 			@ferm::rule { 'dsa-postgres-main':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 5.153.231.23/32 5.153.231.25/32 206.12.19.141/32 5.153.231.26/32 5.153.231.18/32 5.153.231.28/32 5.153.231.249/32 5.153.231.29/32))'
 			}
 			@ferm::rule { 'dsa-postgres-main6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128))'
+				rule            => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:23/128 2001:41c8:1000:21::21:25/128 2607:f8f0:610:4000:6564:a62:ce0c:138d/128 2001:41c8:1000:21::21:26/128 2001:41c8:1000:21::21:18/128 2001:41c8:1000:21::21:28/128 2001:41c8:1000:20::20:249/128 2001:41c8:1000:21::21:29/128))'
 			}
 			@ferm::rule { 'dsa-postgres-dak':
 				description     => 'Allow postgress access',
@@ -298,6 +318,16 @@ class ferm::per-host {
 				description     => 'Allow postgress access',
 				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-wanna-build-ports':
+				# portman
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5436, ( 5.153.231.29/32 ))'
+			}
+			@ferm::rule { 'dsa-postgres-wanna-build-ports6':
+				domain          => 'ip6',
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5436, ( 2001:41c8:1000:21::21:29/128 ))'
+			}
 			@ferm::rule { 'dsa-postgres-bacula':
 				# dinis
 				description     => 'Allow postgress access1',
@@ -387,6 +417,16 @@ class ferm::per-host {
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:41c8:1000:21::21:12/128 ))'
 			}
+			@ferm::rule { 'dsa-postgres-replication':
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.180/32 ))'
+			}
+		}
+		lw04: {
+			@ferm::rule { 'dsa-postgres-snapshot':
+				description     => 'Allow postgress access',
+				rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.181/32 185.17.185.182/32 ))'
+			}
 		}
 		default: {}
 	}