Make hiera's debug_mirror look like debian_mirror

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

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index dddf520..8c26b78 100644 (file)
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -4,19 +4,14 @@ class roles::debug_mirror {
        $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
        $archive_root = "${mirror_basedir_prefix}debian-debug"
 
-       $vhost_listen = $::hostname ? {
-               klecker    => '130.89.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',
-               mirror-accumu => '*:80',
-               default => '*:80',
-       }
-       $onion_v4_addr = $::hostname ? {
-               klecker    => '130.89.148.14',
-               mirror-isc => '149.20.4.15',
-               mirror-accumu => '130.242.6.199',
-               default    => undef,
-       }
+       $listen_addresses = hiera('roles.debug_mirror')
+               .dig($::fqdn, 'listen-addresses')
+               .then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
+               .lest || { ['*:80'] }
+
+       $vhost_listen = join($listen_addresses, ' ')
+       $onion_v4_addr = hiera("roles.debug_mirror", {})
+               .dig($::fqdn, 'onion_v4_address')
 
        apache2::site { '010-debug.mirrors.debian.org':
                site   => 'debug.mirrors.debian.org',
@@ -35,8 +30,11 @@ class roles::debug_mirror {
                }
        }
 
+       $hosts_to_check = hiera('roles.debug_mirror', {})
+               .filter |$h| { $h[1]['service-hostname'] }
+               .map |$h| { $h[1]['service-hostname'] }
        roles::mirror_health { 'debug':
-               check_hosts     => hiera('roles.debug_mirror'),
+               check_hosts     => $hosts_to_check,
                check_service   => 'debug',
                url             => 'http://debug.backend.mirrors.debian.org/debian-debug/dists/sid-debug/Release',
                health_url      => 'http://debug.backend.mirrors.debian.org/_health',