X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=6d73b4a05c2d7ff0bf0644a15552a8f19b141f41;hb=5e6d9dff0b2445ea867131e13d7a793cd8649e48;hp=17b16070429498dc8e9955f1fb0d61d1b1db3523;hpb=25eb0df7b61a728f13208053044f5cd21f07d57d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 17b160704..6d73b4a05 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -173,24 +173,14 @@ class ferm::per-host {
 				rule            => 'proto tcp daddr 206.12.19.150 dport 80 REDIRECT to-ports 6081',
 			}
 		}
-		lw05: {
+		lw07: {
 			@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',
+				rule            => 'proto tcp daddr 185.17.185.185 dport 80 REDIRECT to-ports 6081',
 			}
 		}
 		default: {}
@@ -413,13 +403,13 @@ class ferm::per-host {
 			}
 			@ferm::rule { 'dsa-postgres-replication':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.180/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 2001:1af8:4020:b030:deb::187/128 ))'
 			}
 		}
-		lw04: {
+		lw07: {
 			@ferm::rule { 'dsa-postgres-snapshot':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.181/32 185.17.185.182/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5439, ( 185.17.185.176/28 2001:1af8:4020:b030::/64 ))'
 			}
 		}
 		default: {}
@@ -470,7 +460,7 @@ REJECT reject-with icmp-admin-prohibited
 		master: {
 			@ferm::rule { 'dsa-tftp':
 				description     => 'Allow tftp access',
-				rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 ))'
+				rule            => '&SERVICE_RANGE(udp, 69, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}
 		}
 	}