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 f6e5696..78aa89b 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,14 +1,15 @@
 class roles::debian_mirror {
        include roles::archvsync_base
 
-       $vhost_listen = join([
-               $::hostname ? {
-                       klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80',
-                       mirror-bytemark => '5.153.231.45:80 [2001:41c8:1000:21::21:45]: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',
-               },
+       $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([
+                *$listen_addresses,
                has_role('bgp') ? {
                        true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
                        default => '',
@@ -19,9 +20,6 @@ class roles::debian_mirror {
                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',
@@ -39,4 +37,18 @@ class roles::debian_mirror {
                        target_address => $onion_v4_addr,
                }
        }
+
+        # 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   => $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',
+        }
 }