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

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index 6ff82cb13..b43d66ac3 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -1,14 +1,20 @@
 class roles::debug_mirror {
 	include roles::archvsync_base
 
+	$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',
+		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,
 	}
 
@@ -17,7 +23,7 @@ class roles::debug_mirror {
 		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 +34,11 @@ class roles::debug_mirror {
 			target_address => $onion_v4_addr,
 		}
 	}
+
+	roles::mirror_health { 'debug':
+		check_hosts	=> hiera('roles.debug_mirror'),
+		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',
+	}
 }