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

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 0da036ec0..302c5d86b 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,21 +1,26 @@
 class roles::debian_mirror {
 	include roles::archvsync_base
 
-	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80',
-		mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
-		mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
-		default => '*:80',
-	}
+	$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([
+		*$listen_addresses,
+		has_role('bgp') ? {
+			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
+			default => '',
+		}], ' ')
 	$onion_v4_addr = $::hostname ? {
-		bilbao     => '5.153.231.37',
+		mirror-bytemark => '5.153.231.45',
 		klecker    => '130.89.148.12',
 		mirror-isc => '149.20.4.15',
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian',
-	}
 
 	apache2::site { '010-ftp.debian.org':
 		site   => 'ftp.debian.org',
@@ -33,4 +38,18 @@ class roles::debian_mirror {
 			target_address => $onion_v4_addr,
 		}
 	}
+
+	# 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',
+	}
 }