projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b48d20f
)
Simplify debian_mirror for hiera-hash
author
Tollef Fog Heen
<tfheen@err.no>
Fri, 2 Feb 2018 10:06:08 +0000
(11:06 +0100)
committer
Tollef Fog Heen
<tfheen@err.no>
Fri, 2 Feb 2018 10:06:08 +0000
(11:06 +0100)
modules/roles/manifests/debian_mirror.pp
patch
|
blob
|
history
diff --git
a/modules/roles/manifests/debian_mirror.pp
b/modules/roles/manifests/debian_mirror.pp
index
4fa22b8
..
2e22aaa
100644
(file)
--- 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'] }