X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=302c5d86b5a14b7f7a91125fc0b88156a7275d9e;hb=4050864b78a0820698589e994b16d6fa2252b147;hp=549e982ba3d0f93732c8d66536927f2a7aca8b63;hpb=e1640006ff8ed8f0224014d8866f97815c1ab541;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 549e982ba..302c5d86b 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,17 +3,14 @@ class roles::debian_mirror {
 
 	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
 	$archive_root = "${mirror_basedir_prefix}debian"
+	$listen_addresses = Hash(hiera('roles.debian_mirror').map |$h| {
+		$h.map |$k, $v| { [$k,$v] }[0]
+	}).dig($::fqdn, 'listen-addresses')
+		.then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
+		.lest || { ['*:80'] }
 
 	$vhost_listen = join([
-		$::hostname ? {
-			klecker    => '130.89.148.12:80 127.0.0.1:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80 [::1]:80',
-			mirror-isc => '149.20.4.15:80 127.0.0.1:80 [2001:4f8:1:c::15]:80 [::1]:80',
-			mirror-conova => '217.196.149.232:80 127.0.0.1:80 [2a02:16a8:dc41:100::232]:80 [::1]:80',
-			default => hiera("roles.debian_mirror.${::hostname}.listen-addresses", 'missing') ? {
-				'missing' => '*:80',
-				default => join([hiera("roles.debian_mirror.${::hostname}.listen-addresses"), '127.0.0.1:80', '[::1]:80'])
-			}
-		},
+		*$listen_addresses,
 		has_role('bgp') ? {
 			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
 			default => '',
@@ -42,10 +39,17 @@ class roles::debian_mirror {
 		}
 	}
 
-        roles::mirror_health { 'ftp':
-		check_hosts   => ['accumu.debian.backend.mirrors.debian.org', 'bytemark.debian.backend.mirrors.debian.org', 'conova.debian.backend.mirrors.debian.org', 'skroutz.debian.backend.mirrors.debian.org'],
+	# roles is a list of hashes, which needs to be unpacked into a regular hash
+	$mirrors = hiera('roles.debian_mirror', [])
+	# unpack $mirrors and construct a hash
+	$m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]})
+	$fastly_mirrors = $m2.filter |$h| { $h[1]['fastly-backend'] }
+	$hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
+
+	roles::mirror_health { 'ftp':
+		check_hosts   => $hosts_to_check,
 		check_service => 'ftp',
 		url           => 'http://debian.backend.mirrors.debian.org/debian/dists/sid/Release',
 		health_url    => 'http://debian.backend.mirrors.debian.org/_health',
-        }
+	}
 }