X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebug_mirror.pp;h=ac01ff603bce7b86a3d390cf4e5b4df3d6f138f8;hb=accfb8fd412b17c2b61f9ab1173aad720c8ffd61;hp=6ff82cb13f5c23023b6f5b3a27468403e6cdc041;hpb=9fcfecbfcca2dcf3f446d3b6fe989f40143392f4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index 6ff82cb13..ac01ff603 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -1,23 +1,24 @@
 class roles::debug_mirror {
 	include roles::archvsync_base
 
-	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-		mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
-		default => '*:80',
-	}
-	$onion_v4_addr = $::hostname ? {
-		klecker    => '130.89.148.14',
-		mirror-isc => '149.20.4.15',
-		default    => undef,
-	}
+	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+	$archive_root = "${mirror_basedir_prefix}debian-debug"
+
+	$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',
 		content => template('roles/apache-debug.mirrors.debian.org.erb'),
 	}
 
-	if has_role('static_mirror_onion') {
+	if has_role('debug_mirror_onion') {
 		if ! $onion_v4_addr {
 			fail("Do not have an onion_v4_addr set for $::hostname.")
 		}
@@ -28,4 +29,13 @@ class roles::debug_mirror {
 			target_address => $onion_v4_addr,
 		}
 	}
+
+	$hosts_to_check = hiera('roles.debug_mirror', {})
+		.map |$h| { $h[1]['service-hostname'] }
+	roles::mirror_health { 'debug':
+		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',
+	}
 }