X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=78aa89bcbbff8dceb118c8554cec36af4ac0bb78;hb=afc4eac29fa1c512f34061048f84c43208e586e5;hp=cdd2de944303816d17c87b50a34da091b3151d61;hpb=16dd6904ed60f5f831a15d5eeb8901405764e989;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index cdd2de944..78aa89bcb 100644
--- 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 => '',