X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=46eb1ac7b0fab8211424369eda4f614dba884172;hb=33ef9d8cf9b3c33aa8b0abc678a2b94d4aaefb55;hp=6273a57ba15c32854c709436bd8689afa430a2dd;hpb=78744dd0999177374e593a1d92be6896512f7fe6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 6273a57ba..46eb1ac7b 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,41 +1,43 @@
 class roles::debian_mirror {
 	include roles::archvsync_base
 
+	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+	$archive_root = "${mirror_basedir_prefix}debian"
+	$listen_addresses = hiera('roles.debian_mirror')
+		.dig($::fqdn, 'listen-addresses')
+		.then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
+		.lest || { ['*:80'] }
+
 	$vhost_listen = join([
-		$::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',
-		},
+		*$listen_addresses,
 		has_role('bgp') ? {
 			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
 			default => '',
 		}], ' ')
-	$onion_v4_addr = $::hostname ? {
-		mirror-bytemark => '5.153.231.37',
-		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',
 		content => template('roles/apache-ftp.debian.org.erb'),
 	}
 
-	if has_role('debian_mirror_onion') {
-		if ! $onion_v4_addr {
-			fail("Do not have an onion_v4_addr set for $::hostname.")
-		}
-
+	$onion_v4_addr = hiera("roles.debian_mirror", {})
+		.dig($::fqdn, 'onion_v4_address')
+	if $onion_v4_addr {
 		onion::service { 'ftp.debian.org':
 			port => 80,
 			target_port => 80,
 			target_address => $onion_v4_addr,
 		}
 	}
+
+	$hosts_to_check = hiera('roles.debian_mirror', {})
+		.filter |$h| { $h[1]['fastly-backend'] }
+		.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',
+	}
 }