X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper_host.pp;h=15c3b8b6b7860f4ca56d93298b4e9c68ef804c17;hb=d4c0aecd0fc7f16133fdf2887126036a9dd6c668;hp=18f8b5ab8cba52b151e9fe9275281cc57a3d2471;hpb=f5bdff6b668ca7c9e51c2a6d557c76b19cb8187d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per_host.pp b/modules/ferm/manifests/per_host.pp
index 18f8b5ab8..15c3b8b6b 100644
--- a/modules/ferm/manifests/per_host.pp
+++ b/modules/ferm/manifests/per_host.pp
@@ -60,29 +60,9 @@ class ferm::per_host {
 				rule            => '&SERVICE(tcp, 636)'
 			}
 		}
-		sonntag: {
-			@ferm::rule { 'dsa-bugs-search':
-				description  => 'port 1978 for bugs-search from bug web frontends',
-				rule         => '&SERVICE_RANGE(tcp, 1978, ( 140.211.166.26 209.87.16.39 ))'
-			}
-		}
 		default: {}
 	}
 
-	# redirect snapshot into varnish
-	case $::hostname {
-		sibelius: {
-			@ferm::rule { 'dsa-snapshot-varnish':
-				rule            => '&SERVICE(tcp, 6081)',
-			}
-			@ferm::rule { 'dsa-nat-snapshot-varnish':
-				table           => 'nat',
-				chain           => 'PREROUTING',
-				rule            => 'proto tcp daddr 193.62.202.30 dport 80 REDIRECT to-ports 6081',
-			}
-		}
-		default: {}
-	}
 	case $::hostname {
 		bm-bl1,bm-bl2: {
 			@ferm::rule { 'dsa-vrrp':
@@ -128,13 +108,16 @@ class ferm::per_host {
 		ullmann: {
 			@ferm::rule { 'dsa-postgres-udd':
 				description     => 'Allow postgress access',
+				domain          => '(ip ip6)',
 				# quantz, master, coccia
-				rule            => '&SERVICE_RANGE(tcp, 5452, ( 5.153.231.28/32 82.195.75.110/32 5.153.231.11/32 ))'
-			}
-			@ferm::rule { 'dsa-postgres-udd6':
-				domain          => '(ip6)',
-				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, 5452, ( 2001:41c8:1000:21::21:28/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:11/32 ))'
+				rule            => @(EOF)
+					&SERVICE_RANGE(tcp, 5452, (
+						5.153.231.28/32  2001:41c8:1000:21::21:28/128			# quantz
+						82.195.75.110/32 2001:41b8:202:deb:216:36ff:fe40:4001/128	# master
+						5.153.231.11/32  2001:41c8:1000:21::21:11/128			# coccia
+						5.153.231.29/32  2001:41c8:1000:21::21:29/128			# respighi
+					))
+					| EOF
 			}
 		}
 		fasolo: {
@@ -262,26 +245,6 @@ class ferm::per_host {
 				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V6 ))'
 			}
 		}
-		sibelius: {
-			@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-postgres-replication':
-				description     => 'Allow postgress access',
-				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 2001:630:206:4000:1a1a:0:c13e:ca1a/128 ))'
-			}
-		}
 		sallinen: {
 			@ferm::rule { 'dsa-postgres-backup':
 				description     => 'Allow postgress access',