From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 1 Feb 2018 18:38:26 +0000 (+0100)
Subject: Move listen-address information out of manifest and into hiera
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=65d8cb87fffc6f75d7f7808f1e78ac16ef7145a8;p=mirror%2Fdsa-puppet.git

Move listen-address information out of manifest and into hiera
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 6b13e5ede..a4a54abcf 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -241,6 +241,10 @@ roles:
     - vittoria.debian.org
   debian_mirror:
     - klecker.debian.org
+        listen-addresses:
+          - '130.89.148.12:80'
+          - '[2001:610:1908:b000::148:12]:80'
+          - '[2001:67c:2564:a119::148:12]:80'
     - mirror-bytemark.debian.org:
         service-hostname: bytemark.debian.backend.mirrors.debian.org
         listen-addresses:
@@ -253,8 +257,14 @@ roles:
     - mirror-skroutz.debian.org:
         service-hostname: skroutz.debian.backend.mirrors.debian.org
         fastly-backend: true
-    - mirror-conova.debian.org
-    - mirror-isc.debian.org
+    - mirror-conova.debian.org:
+        listen-addresses:
+          - '217.196.149.232:80'
+          - '[2a02:16a8:dc41:100::232]:80'
+    - mirror-isc.debian.org:
+        listen-addresses:
+          - '149.20.4.15:80'
+          - '[2001:4f8:1:c::15]:80'
   debian_mirror_onion:
     - klecker.debian.org
     - mirror-bytemark.debian.org
diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 549e982ba..c3e2ab1c3 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -5,14 +5,9 @@ class roles::debian_mirror {
 	$archive_root = "${mirror_basedir_prefix}debian"
 
 	$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-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 => 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'])
-			}
+		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'])
 		},
 		has_role('bgp') ? {
 			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',