X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=01e9cdaf124ffe6f64bd52bfcf0d1129dcad4cdd;hb=7844ca815c0593b0ec5b98102af4d2125c1f395f;hp=e8d445a5d3bbec9dcbdf6d640d7257ffd96d7474;hpb=e1640006ff8ed8f0224014d8866f97815c1ab541;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index e8d445a5d..01e9cdaf1 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -66,6 +66,12 @@ class ferm::per_host {
 				rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 209.87.16.39 ))'
 			}
 		}
+		vittoria: {
+			@ferm::rule { 'debconf18':
+				description	=> 'temporarily allow DC18 access',
+				rule		=> '&SERVICE_RANGE(tcp, 5432, ( 140.113.6.241/32 140.110.240.4/32 ))'
+			}
+		}
 		default: {}
 	}
 
@@ -81,16 +87,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 {
@@ -98,9 +94,6 @@ class ferm::per_host {
 			@ferm::rule { 'dsa-vrrp':
 				rule            => 'proto vrrp daddr 224.0.0.18 jump ACCEPT',
 			}
-			@ferm::rule { 'dsa-conntrackd':
-				rule            => 'interface vlan2 daddr 225.0.0.50 jump ACCEPT',
-			}
 			@ferm::rule { 'dsa-bind-notrack-in':
 				domain      => 'ip',
 				description => 'NOTRACK for nameserver traffic',
@@ -295,6 +288,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',