X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=e8d445a5d3bbec9dcbdf6d640d7257ffd96d7474;hb=59713004fd05b67f9da0cde10ff37f5d70083f0a;hp=952f52ab2cbe39a40196b903a09a2670e55446a6;hpb=d50bde7317480a53254bb75a3fc31ad9063454e0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 952f52ab2..e8d445a5d 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',
@@ -38,6 +24,10 @@ class ferm::per_host {
 				description     => 'Allow syslog access',
 				rule            => '&SERVICE_RANGE(tcp, 5140, $HOST_DEBIAN_V6)'
 			}
+			@ferm::rule { 'fastly-syslog':
+				description     => 'Allow syslog access',
+				rule            => '&SERVICE_RANGE(tcp, 5141, $HOST_FASTLY)'
+			}
 		}
 		kaufmann: {
 			@ferm::rule { 'dsa-hkp':
@@ -146,22 +136,6 @@ class ferm::per_host {
 		default: {}
 	}
 
-	# elasticsearch stuff
-	case $::hostname {
-		stockhausen: {
-			@ferm::rule { 'dsa-elasticsearch-bendel':
-				domain          => '(ip)',
-				description     => 'Allow elasticsearch access from bendel',
-				rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 82.195.75.100/32 ))'
-			}
-			@ferm::rule { 'dsa-elasticsearch-bendel6':
-				domain          => '(ip6)',
-				description     => 'Allow elasticsearch access from bendel',
-				rule            => '&SERVICE_RANGE(tcp, 9200:9300, ( 2001:41b8:202:deb:216:36ff:fe40:4002/128 ))'
-			}
-		}
-	}
-
 	# postgres stuff
 	case $::hostname {
 		ullmann: {
@@ -270,7 +244,7 @@ class ferm::per_host {
 		}
 		danzi: {
 			@ferm::rule { 'dsa-postgres-danzi':
-				# ubc, wuit
+				# ubc, wuiet
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5433, ( 206.12.19.0/24 209.87.16.0/24 5.153.231.18/32 ))'
 			}
@@ -282,25 +256,12 @@ class ferm::per_host {
 
 			@ferm::rule { 'dsa-postgres2-danzi':
 				description     => 'Allow postgress access2',
-				rule            => '&SERVICE_RANGE(tcp, 5437, ( 206.12.19.0/24 209.87.16.0/24 ))'
-			}
-			@ferm::rule { 'dsa-postgres3-danzi':
-				description     => 'Allow postgress access3',
-				rule            => '&SERVICE_RANGE(tcp, 5436, ( 206.12.19.0/24 209.87.16.0/24 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
 			}
-			@ferm::rule { 'dsa-postgres4-danzi':
-				description     => 'Allow postgress access4',
-				rule            => '&SERVICE_RANGE(tcp, 5438, ( 206.12.19.0/24 209.87.16.0/24 ))'
-			}
-
-			@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-danzi6':
+				domain		=> 'ip6',
+				description     => 'Allow postgress access2',
+				rule            => '&SERVICE_RANGE(tcp, 5434, ( 2607:f8f0:614:1::/64 ))'
 			}
 		}
 		seger: {
@@ -326,12 +287,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: {
@@ -345,28 +306,6 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
 			}
 		}
-		melartin,vittoria: {
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-		}
-		buxtehude: {
-			@ferm::rule { 'dsa-postgres-backup':
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V4 ))'
-			}
-			@ferm::rule { 'dsa-postgres-backup6':
-				domain          => 'ip6',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5433 5441), ( $HOST_PGBACKUPHOST_V6 ))'
-			}
-		}
 		default: {}
 	}
 	# vpn fu