From: Tollef Fog Heen <tfheen@err.no>
Date: Fri, 2 Feb 2018 10:06:08 +0000 (+0100)
Subject: Simplify debian_mirror for hiera-hash
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=9d1ab953e4515ead9837444e14dc7842b97b6166;p=mirror%2Fdsa-puppet.git

Simplify debian_mirror for hiera-hash
---

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 4fa22b891..2e22aaa16 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,9 +3,8 @@ 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')
+	$listen_addresses = hiera('roles.debian_mirror')
+		.dig($::fqdn, 'listen-addresses')
 		.then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] }
 		.lest || { ['*:80'] }