X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=46eb1ac7b0fab8211424369eda4f614dba884172;hb=6635c186c4d7bd82e45d64d686679503b5593764;hp=4fa22b891a2c8d35cf12ac21ed144373e20f2a09;hpb=271ad0ce3540fdd25fd99d411fc6a74cae6cea41;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 4fa22b891..46eb1ac7b 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,9 +3,8 @@ class roles::debian_mirror {
 
 	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
 	$archive_root = "${mirror_basedir_prefix}debian"
-	$listen_addresses = Hash(hiera('roles.debian_mirror').map |$h| {
-		$h.map |$k, $v| { [$k,$v] }[0]
-	}).dig($::fqdn, 'listen-addresses')
+	$listen_addresses = hiera('roles.debian_mirror')
+		.dig($::fqdn, 'listen-addresses')
 		.then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
 		.lest || { ['*:80'] }
 
@@ -15,23 +14,15 @@ class roles::debian_mirror {
 			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
 			default => '',
 		}], ' ')
-	$onion_v4_addr = $::hostname ? {
-		mirror-bytemark => '5.153.231.45',
-		klecker    => '130.89.148.12',
-		mirror-isc => '149.20.4.15',
-		default    => undef,
-	}
 
 	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,
@@ -39,9 +30,9 @@ class roles::debian_mirror {
 		}
 	}
 
-	$mirrors = hiera('roles.debian_mirror', {})
-	$fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
-	$hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
+	$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,