Pull listen addresses for apache mirrors from hiera

This is slightly crazy with a bit of transitional logic.

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index abb603f..6b13e5e 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -243,6 +243,9 @@ roles:
     - klecker.debian.org
     - mirror-bytemark.debian.org:
         service-hostname: bytemark.debian.backend.mirrors.debian.org
+        listen-addresses:
+          - '5.153.231.45:80'
+          - '[2001:41c8:1000:21::21:45]:80'
         fastly-backend: true
     - mirror-accumu.debian.org:
         service-hostname: accumu.debian.backend.mirrors.debian.org

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index e790c88..549e982 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -7,10 +7,12 @@ class roles::debian_mirror {
        $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',
+                       default => 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'])
+                       }
                },
                has_role('bgp') ? {
                        true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',