Whitespace

[mirror/dsa-puppet.git] / modules / roles / manifests / debian_mirror.pp

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index c3e2ab1..78aa89b 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,12 +3,13 @@ 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')
+                .lest || { ['*:80'] }
 
-       $vhost_listen = join([
-               hiera("roles.debian_mirror.${::hostname}.listen-addresses", 'missing') ? {
-                       'missing' => '*:80',
-                       default => join([hiera("roles.debian_mirror.${::hostname}.listen-addresses"), '127.0.0.1:80', '[::1]:80'])
-               },
+        $vhost_listen = join([
+                *$listen_addresses,
                has_role('bgp') ? {
                        true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
                        default => '',
@@ -37,8 +38,15 @@ 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'] }
+
         roles::mirror_health { 'ftp':
-               check_hosts   => ['accumu.debian.backend.mirrors.debian.org', 'bytemark.debian.backend.mirrors.debian.org', 'conova.debian.backend.mirrors.debian.org', 'skroutz.debian.backend.mirrors.debian.org'],
+               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',