X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebug_mirror.pp;h=c178b1ef63365a671cbd9fdd516400f666b89e40;hb=13a25f50b3c02c19412a0b735c655ca203645105;hp=da70581fc23031f1415c1293253f6fdd4be26894;hpb=bc0339c24b44a4e78e82ff588d7bb0e9f665487c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index da70581fc..c178b1ef6 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -1,12 +1,32 @@
 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.20.22:80 [2001:4f8:8:36::1deb:22]: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',
 		default => '*:80',
 	}
+	$onion_v4_addr = $::hostname ? {
+		klecker    => '130.89.148.14',
+		mirror-isc => '149.20.4.15',
+		default    => undef,
+	}
 
 	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 ! $onion_v4_addr {
+			fail("Do not have an onion_v4_addr set for $::hostname.")
+		}
+
+		onion::service { 'debug.mirrors.debian.org':
+			port => 80,
+			target_port => 80,
+			target_address => $onion_v4_addr,
+		}
+	}
 }