X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=46eb1ac7b0fab8211424369eda4f614dba884172;hb=2f488926a0357a55878fd6f6c18727617a10f2be;hp=693aa28bdb302aecb21dd668bfc04eac3c71efbd;hpb=3e64be9817dc2437b2b6d4daa4070f44824922d4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 693aa28bd..46eb1ac7b 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,36 +3,26 @@ class roles::debian_mirror {
 
 	$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 127.0.0.1:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80 [::1]:80',
-                        mirror-bytemark => '5.153.231.45:80 127.0.0.1:80 [2001:41c8:1000:21::21:45]:80 [::1]:80',
-                        mirror-isc => '149.20.4.15:80 127.0.0.1:80 [2001:4f8:1:c::15]:80 [::1]:80',
-                        mirror-conova => '217.196.149.232:80 127.0.0.1:80 [2a02:16a8:dc41:100::232]:80 [::1]:80',
-                        default => '*:80',
-                },
+	$vhost_listen = join([
+		*$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.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,
@@ -40,17 +30,14 @@ class roles::debian_mirror {
 		}
 	}
 
-        # roles is a list of hashes, which needs to be unpacked into a regular hash
-        $mirrors = hiera('roles.debian_mirror', [])
-        # unpack $mirrors and construct a hash
-        $m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]})
-        $fastly_mirrors = $m2.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':
+	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',
-        }
+	}
 }