X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fferm%2Fmanifests%2Fper-host.pp;h=7db3c2dbd1db7b2aa5f81e37f269d92f635a00dd;hb=1c732b4f31f2b5ea49881f4d96c1730a5c850cfb;hp=9bc01bc14adcaf7aa173d8ea2cbdc4ce74f0ecab;hpb=4700a4c512f049ac4cfae3d7ab27c022a682b53c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/ferm/manifests/per-host.pp b/modules/ferm/manifests/per-host.pp
index 9bc01bc14..7db3c2dbd 100644
--- a/modules/ferm/manifests/per-host.pp
+++ b/modules/ferm/manifests/per-host.pp
@@ -3,127 +3,6 @@ class ferm::per-host {
 		include ferm::zivit
 	}
 
-	if $::hostname in [glinka,gretchaninov] {
-		ferm::rule { 'dsa-rsync':
-			domain      => '(ip ip6)',
-			description => 'Allow rsync access',
-			rule        => '&SERVICE(tcp, 873)'
-		}
-	}
-
-	case $::hostname {
-		bm-bl9: {
-			@ferm::rule { 'dsa-iscsi':
-				description     => 'Allow iscsi access',
-				rule            => '&SERVICE_RANGE(tcp, 3260, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-		}
-		oyens: {
-			@ferm::rule { 'dsa-spice':
-				description     => 'Allow spice-console access',
-				rule            => '&SERVICE(tcp, 6082)'
-			}
-			@ferm::rule { 'dsa-memcache':
-				description     => 'Allow memcache access',
-				rule            => '&SERVICE_RANGE(tcp, 11211, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-memcache6':
-				domain          => 'ip6',
-				description     => 'Allow memcache access',
-				rule            => '&SERVICE_RANGE(tcp, 11211, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-amqp':
-				description     => 'Allow rabbitmq access',
-				rule            => '&SERVICE_RANGE(tcp, 5672, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-amqp6':
-				domain          => 'ip6',
-				description     => 'Allow rabbitmq access',
-				rule            => '&SERVICE_RANGE(tcp, 5672, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-keystone':
-				description     => 'Allow keystone access',
-				rule            => '&SERVICE_RANGE(tcp, 5000, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-keystone6':
-				domain          => 'ip6',
-				description     => 'Allow keystone access',
-				rule            => '&SERVICE_RANGE(tcp, 5000, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-keystone-admin':
-				description     => 'Allow keystone access',
-				rule            => '&SERVICE_RANGE(tcp, 35357, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-keystone-admin6':
-				domain          => 'ip6',
-				description     => 'Allow keystone access',
-				rule            => '&SERVICE_RANGE(tcp, 35357, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-glance-api':
-				description     => 'Allow glance access',
-				rule            => '&SERVICE_RANGE(tcp, 9292, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-glance-api6':
-				domain          => 'ip6',
-				description     => 'Allow glance access',
-				rule            => '&SERVICE_RANGE(tcp, 9292, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-glance-registry':
-				description     => 'Allow glance access',
-				rule            => '&SERVICE_RANGE(tcp, 9191, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-glance-registry6':
-				domain          => 'ip6',
-				description     => 'Allow glance access',
-				rule            => '&SERVICE_RANGE(tcp, 9191, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-neutron':
-				description     => 'Allow glance access',
-				rule            => '&SERVICE_RANGE(tcp, 9696, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-neutron6':
-				domain          => 'ip6',
-				description     => 'Allow glance access',
-				rule            => '&SERVICE_RANGE(tcp, 9696, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-nova-ec2':
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8773, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-nova-ec26':
-				domain          => 'ip6',
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8773, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-nova2':
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8774, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-nova26':
-				domain          => 'ip6',
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8774, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-nova-metadata':
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8775, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-nova-metadata6':
-				domain          => 'ip6',
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8775, ( 2001:41c8:1000::/48 ))'
-			}
-			@ferm::rule { 'dsa-cinder':
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8776, ( 5.153.231.240/27 172.29.123.0/24 ))'
-			}
-			@ferm::rule { 'dsa-cinder6':
-				domain          => 'ip6',
-				description     => 'Allow nova access',
-				rule            => '&SERVICE_RANGE(tcp, 8776, ( 2001:41c8:1000::/48 ))'
-			}
-		}
-	}
 	case $::hostname {
 		czerny,clementi: {
 			@ferm::rule { 'dsa-upsmon':
@@ -355,14 +234,13 @@ class ferm::per-host {
 			}
 
 			@ferm::rule { 'dsa-postgres-backup':
-				# ubc, wuit
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V4 ))'
+				rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V4 ))'
 			}
 			@ferm::rule { 'dsa-postgres-backup6':
 				domain          => 'ip6',
 				description     => 'Allow postgress access',
-				rule            => '&SERVICE_RANGE(tcp, (5435 5436), ( $HOST_PGBACKUPHOST_V6 ))'
+				rule            => '&SERVICE_RANGE(tcp, (5435 5436 5440), ( $HOST_PGBACKUPHOST_V6 ))'
 			}
 
 			@ferm::rule { 'dsa-postgres-dedup':
@@ -463,7 +341,7 @@ class ferm::per-host {
 				rule            => '&SERVICE_RANGE(tcp, 5439, ( 2001:1af8:4020:b030::/64 ))'
 			}
 		}
-		vittoria: {
+		melartin,vittoria: {
 			@ferm::rule { 'dsa-postgres-backup':
 				description     => 'Allow postgress access',
 				rule            => '&SERVICE_RANGE(tcp, 5432, ( $HOST_PGBACKUPHOST_V4 ))'
@@ -474,6 +352,17 @@ class ferm::per-host {
 				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