projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
debian_mirror.pp
diff --git
a/modules/roles/manifests/debian_mirror.pp
b/modules/roles/manifests/debian_mirror.pp
index
cdd2de9
..
78aa89b
100644
(file)
--- 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"
$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 => '',
has_role('bgp') ? {
true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
default => '',