X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=e527d3c9701e105304da97f8be47ffe8368ca61b;hb=c5eb42423acaf8d52b565cbcaec8fe0b34deb67f;hp=1bd5628107908dda84d86eb6bb68dd09697b4e67;hpb=58529303e11dc022f7db888ade308a4edb700177;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 1bd562810..e527d3c97 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -14,20 +14,6 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 3493, ( 82.195.75.64/26 192.168.43.0/24 ))'
 			}
 		}
-		bendel: {
-			@ferm::rule { 'listmaster-ontp-in':
-				description => 'ONTP has a broken mail setup',
-				table       => 'filter',
-				chain       => 'INPUT',
-				rule        => 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
-			}
-			@ferm::rule { 'listmaster-ontp-out':
-				description => 'ONTP has a broken mail setup',
-				table       => 'filter',
-				chain       => 'OUTPUT',
-				rule        => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
-			}
-		}
 		lotti,lully,loghost-grnet-01: {
 			@ferm::rule { 'dsa-syslog':
 				description     => 'Allow syslog access',
@@ -112,9 +98,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',
@@ -273,28 +256,10 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
 			}
 			@ferm::rule { 'dsa-postgres2-danzi6':
+				domain		=> 'ip6',
 				description     => 'Allow postgress access2',
 				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
 			}
-
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-			@ferm::rule { 'dsa-postgres2-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres2-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5434, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
 		}
 		seger: {
 			@ferm::rule { 'dsa-postgres-backup':
@@ -319,12 +284,12 @@ class ferm::per_host {
 			}
 			@ferm::rule { 'dsa-postgres-replication':
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 185.17.185.187/32 193.62.202.26/32 ))'
 			}
 			@ferm::rule { 'dsa-postgres-replication6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5433, ( 2001:1af8:4020:b030:deb::187/128 2001:630:206:4000:1a1a:0:c13e:ca1a/128 ))'
 			}
 		}
 		lw07: {