From a9abf4b71ec29ba7b5409a3f3f523ff9e80217c6 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 16 Sep 2019 11:38:49 +0200
Subject: [PATCH 1/1] ports_mirror: replace the vhost_listen string with an
 Array of IP addresses

---
 hieradata/nodes/klecker.debian.org.yaml    |  3 +--
 hieradata/nodes/mirror-isc.debian.org.yaml |  3 +--
 modules/roles/manifests/ports_mirror.pp    | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/hieradata/nodes/klecker.debian.org.yaml b/hieradata/nodes/klecker.debian.org.yaml
index 57f87f310..288c2d912 100644
--- a/hieradata/nodes/klecker.debian.org.yaml
+++ b/hieradata/nodes/klecker.debian.org.yaml
@@ -3,9 +3,8 @@ classes:
   - roles::ports_mirror
   - roles::static_mirror_web
 
-roles::ports_mirror::vhost_listen: '130.89.148.14:80 [2001:67c:2564:a119::148:14]:80'
+roles::ports_mirror::listen_addr: ['130.89.148.14', '2001:67c:2564:a119::148:14']
 roles::ports_mirror::onion_service: true
-roles::ports_mirror::onion_addr: '130.89.148.14'
 
 roles::static_mirror_web::vhost_listen: '130.89.148.14:80 [2001:67c:2564:a119::148:14]:80'
 roles::static_mirror_web::vhost_listen_443: '130.89.148.14:443 [2001:67c:2564:a119::148:14]:443'
diff --git a/hieradata/nodes/mirror-isc.debian.org.yaml b/hieradata/nodes/mirror-isc.debian.org.yaml
index dbc6b4ed1..f910a67d7 100644
--- a/hieradata/nodes/mirror-isc.debian.org.yaml
+++ b/hieradata/nodes/mirror-isc.debian.org.yaml
@@ -3,9 +3,8 @@ classes:
   - roles::ports_mirror
   - roles::static_mirror_web
 
-roles::ports_mirror::vhost_listen: '149.20.4.15:80 [2001:4f8:1:c::15]:80'
+roles::ports_mirror::listen_addr: ['149.20.4.15', '2001:4f8:1:c::15']
 roles::ports_mirror::onion_service: true
-roles::ports_mirror::onion_addr: '149.20.4.15'
 
 roles::static_mirror_web::vhost_listen: '149.20.4.15:80 [2001:4f8:1:c::15]:80'
 roles::static_mirror_web::vhost_listen_443: '149.20.4.15:443 [2001:4f8:1:c::15]:443'
diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index d8ae988eb..1f31af2f8 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,12 +1,22 @@
+# a mirror of ports.debian.org
+#
+# @param listen_addr IP addresses to have apache listen on
+# @param onion_service provide the onion service from this host
 class roles::ports_mirror(
-  String  $vhost_listen = '*:80',
+  Array[Stdlib::IP::Address] $listen_addr = [],
   Boolean $onion_service = false,
-  Optional[Stdlib::IP::Address] $onion_addr = undef,
 ) {
   include roles::archvsync_base
 
   include apache2
 
+  $_enclosed_addresses = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $_addr_port_elements = $_enclosed_addresses.map |$a| { "${a}:80" }
+  $vhost_listen = join($_addr_port_elements, ' ')
+
   $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
   $archive_root = "${mirror_basedir_prefix}debian-ports"
 
@@ -16,8 +26,9 @@ class roles::ports_mirror(
   }
 
   if $onion_service {
+    $onion_addr = filter_ipv4($listen_addr)[0]
     if ! $onion_addr {
-      fail("Do not have an onion_addr set for ${::hostname}.")
+      fail("Do not have a useable address for the onionservice on ${::hostname}.  Is \$listen_addr empty or does it not have an IPv4 address?.")
     }
 
     onion::service { 'ftp.ports.debian.org':
-- 
2.20.1