X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebug_mirror.pp;h=ac01ff603bce7b86a3d390cf4e5b4df3d6f138f8;hb=2a425a85aee59abba7f8de4b9bb6f61824938d82;hp=b43d66ac38a7c9863e36046ebced1addee5a1c0b;hpb=274093a3dbf357538663b85db00d4f98c051a3ba;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index b43d66ac3..ac01ff603 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -4,19 +4,14 @@ class roles::debug_mirror {
 	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
 	$archive_root = "${mirror_basedir_prefix}debian-debug"
 
-	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]: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',
-		mirror-accumu => '*:80',
-		default => '*:80',
-	}
-	$onion_v4_addr = $::hostname ? {
-		klecker    => '130.89.148.14',
-		mirror-isc => '149.20.4.15',
-		mirror-accumu => '130.242.6.199',
-		default    => undef,
-	}
+	$listen_addresses = hiera('roles.debug_mirror')
+		.dig($::fqdn, 'listen-addresses')
+		.then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
+		.lest || { ['*:80'] }
+
+	$vhost_listen = join($listen_addresses, ' ')
+	$onion_v4_addr = hiera("roles.debug_mirror", {})
+		.dig($::fqdn, 'onion_v4_address')
 
 	apache2::site { '010-debug.mirrors.debian.org':
 		site   => 'debug.mirrors.debian.org',
@@ -35,8 +30,10 @@ class roles::debug_mirror {
 		}
 	}
 
+	$hosts_to_check = hiera('roles.debug_mirror', {})
+		.map |$h| { $h[1]['service-hostname'] }
 	roles::mirror_health { 'debug':
-		check_hosts	=> hiera('roles.debug_mirror'),
+		check_hosts	=> $hosts_to_check,
 		check_service	=> 'debug',
 		url		=> 'http://debug.backend.mirrors.debian.org/debian-debug/dists/sid-debug/Release',
 		health_url	=> 'http://debug.backend.mirrors.debian.org/_health',