From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 2 Feb 2018 08:29:05 +0000 (+0100)
Subject: Pull out listen addresses from hiera again
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=da4d916ea39b5fa0115af28af54d379e7f859059;p=mirror%2Fdsa-puppet.git

Pull out listen addresses from hiera again
---

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 693aa28bd..0b63555e4 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -4,14 +4,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([
-                $::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',
-                },
+                *$listen_addresses,
 		has_role('bgp') ? {
 			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
 			default => '',