X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=2afa57050e8b3644925cc34b79633f7859e5b27f;hb=b8d2184f3c059eb20f7e1a6f30e4f9af75861f6a;hp=1c1bc570c0b8b577c486d4d3785b65b95b044e6a;hpb=34937c41434a378fc0873316a7bb5e3b499ddc42;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 1c1bc570c..2afa57050 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -8,10 +8,12 @@ class ferm::per_host {
 	}
 
 	case $::hostname {
-		vittoria: {
-			@ferm::rule { 'debconf17':
-				description     => 'temporarily allow DC17 access',
-				rule            => '&SERVICE_RANGE(tcp, 5432, (206.167.36.195/32))'
+		casulana: {
+			@ferm::rule { 'dsa-cloud-builds-nat':
+				description     => 'masquerade br1 virtual machines',
+				table           => 'nat',
+				chain           => 'POSTROUTING',
+				rule            => 'saddr 172.16.1.0/24 outerface bond0.21 MASQUERADE'
 			}
 		}
 		czerny,clementi: {
@@ -44,6 +46,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':
@@ -152,22 +158,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: {
@@ -276,7 +266,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 ))'
 			}
@@ -288,25 +278,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 ))'
-			}
-			@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 ))'
+				rule            => '&SERVICE_RANGE(tcp, 5434, ( 209.87.16.0/24 ))'
 			}
-			@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: {
@@ -351,28 +328,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