X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=11f17b9caca1946594da1fea31e5d7ad1c2eb5ca;hb=b0a49d0c8c18d1f3436b89c5ff5d17419e2e39f0;hp=e527d3c9701e105304da97f8be47ffe8368ca61b;hpb=4089b81114c9ce7bd885194cb47204015c182a94;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index e527d3c97..11f17b9ca 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -81,16 +81,6 @@ class ferm::per_host {
 				rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
 			}
 		}
-		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.185 dport 80 REDIRECT to-ports 6081',
-			}
-		}
 		default: {}
 	}
 	case $::hostname {
@@ -292,6 +282,26 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 2001:630:206:4000:1a1a:0:c13e:ca1a/128 ))'
 			}
 		}
+		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',