From: Tollef Fog Heen Date: Fri, 2 Feb 2018 08:59:04 +0000 (+0100) Subject: Whitespace fixups X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=dc93a2cdec7dcb56f62148cc12f99005b950bcf9;p=mirror%2Fdsa-puppet.git Whitespace fixups --- diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp index c0b17b3c6..302c5d86b 100644 --- a/modules/roles/manifests/debian_mirror.pp +++ b/modules/roles/manifests/debian_mirror.pp @@ -3,14 +3,14 @@ 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') - .then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] } - .lest || { ['*:80'] } + $listen_addresses = Hash(hiera('roles.debian_mirror').map |$h| { + $h.map |$k, $v| { [$k,$v] }[0] + }).dig($::fqdn, 'listen-addresses') + .then |$a| { $a + [ '127.0.0.1:80', '[::1]:80' ] } + .lest || { ['*:80'] } - $vhost_listen = join([ - *$listen_addresses, + $vhost_listen = join([ + *$listen_addresses, has_role('bgp') ? { true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80', default => '', @@ -39,17 +39,17 @@ class roles::debian_mirror { } } - # roles is a list of hashes, which needs to be unpacked into a regular hash - $mirrors = hiera('roles.debian_mirror', []) - # unpack $mirrors and construct a hash - $m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]}) - $fastly_mirrors = $m2.filter |$h| { $h[1]['fastly-backend'] } - $hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] } + # roles is a list of hashes, which needs to be unpacked into a regular hash + $mirrors = hiera('roles.debian_mirror', []) + # unpack $mirrors and construct a hash + $m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]}) + $fastly_mirrors = $m2.filter |$h| { $h[1]['fastly-backend'] } + $hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] } - roles::mirror_health { 'ftp': + roles::mirror_health { 'ftp': check_hosts => $hosts_to_check, check_service => 'ftp', url => 'http://debian.backend.mirrors.debian.org/debian/dists/sid/Release', health_url => 'http://debian.backend.mirrors.debian.org/_health', - } + } }