From 864ffe7f455c0aa05346ffd5718c04f032951264 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen Date: Fri, 2 Feb 2018 08:10:31 +0100 Subject: [PATCH] Hard code listen IPs while I debug hiera again --- modules/roles/manifests/debian_mirror.pp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp index cdd2de944..b47053239 100644 --- a/modules/roles/manifests/debian_mirror.pp +++ b/modules/roles/manifests/debian_mirror.pp @@ -4,11 +4,13 @@ class roles::debian_mirror { $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix') $archive_root = "${mirror_basedir_prefix}debian" - $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([ + $::hostname ? { + klecker => '130.89.148.12:80 127.0.0.1:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80 [::1]:80', + mirror-bytemark => '5.153.231.45:80 127.0.0.1:80 [2001:41c8:1000:21::21:45]:80 [::1]:80', + mirror-isc => '149.20.4.15:80 127.0.0.1:80 [2001:4f8:1:c::15]:80 [::1]:80', + mirror-conova => '217.196.149.232:80 127.0.0.1:80 [2a02:16a8:dc41:100::232]:80 [::1]:80', + default => '*:80', has_role('bgp') ? { true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80', default => '', -- 2.20.1