From bc0932e7d274b8c9466bb5346bf8746010792d33 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Mon, 16 Sep 2019 11:50:45 +0200
Subject: [PATCH] static_mirror_web: replace the vhost_listen string with an
 Array of IP addresses

---
 hieradata/nodes/klecker.debian.org.yaml      |  4 +---
 hieradata/nodes/mirror-anu.debian.org.yaml   |  3 +--
 hieradata/nodes/mirror-isc.debian.org.yaml   |  4 +---
 modules/roles/manifests/ports_mirror.pp      |  3 +--
 modules/roles/manifests/static_mirror_web.pp | 17 +++++++++++++----
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/hieradata/nodes/klecker.debian.org.yaml b/hieradata/nodes/klecker.debian.org.yaml
index 288c2d912..4735cb686 100644
--- a/hieradata/nodes/klecker.debian.org.yaml
+++ b/hieradata/nodes/klecker.debian.org.yaml
@@ -6,7 +6,5 @@ classes:
 roles::ports_mirror::listen_addr: ['130.89.148.14', '2001:67c:2564:a119::148:14']
 roles::ports_mirror::onion_service: true
 
-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'
+roles::static_mirror_web::listen_addr: ['130.89.148.14', '2001:67c:2564:a119::148:14']
 roles::static_mirror_web::onion_service: true
-roles::static_mirror_web::onion_addr: '130.89.148.14'
diff --git a/hieradata/nodes/mirror-anu.debian.org.yaml b/hieradata/nodes/mirror-anu.debian.org.yaml
index 80eda9af6..068253be3 100644
--- a/hieradata/nodes/mirror-anu.debian.org.yaml
+++ b/hieradata/nodes/mirror-anu.debian.org.yaml
@@ -1,5 +1,4 @@
 classes:
   - roles::static_mirror_web
 
-roles::static_mirror_web::vhost_listen: '150.203.164.62:80 [2001:388:1034:2900::3e]:80'
-roles::static_mirror_web::vhost_listen_443: '150.203.164.62:443 [2001:388:1034:2900::3e]:443'
+roles::static_mirror_web::listen_addr: ['150.203.164.62', '2001:388:1034:2900::3e']
diff --git a/hieradata/nodes/mirror-isc.debian.org.yaml b/hieradata/nodes/mirror-isc.debian.org.yaml
index f910a67d7..b93336c49 100644
--- a/hieradata/nodes/mirror-isc.debian.org.yaml
+++ b/hieradata/nodes/mirror-isc.debian.org.yaml
@@ -6,7 +6,5 @@ classes:
 roles::ports_mirror::listen_addr: ['149.20.4.15', '2001:4f8:1:c::15']
 roles::ports_mirror::onion_service: true
 
-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'
+roles::static_mirror_web::listen_addr: ['149.20.4.15', '2001:4f8:1:c::15']
 roles::static_mirror_web::onion_service: true
-roles::static_mirror_web::onion_addr: '149.20.4.15'
diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 1f31af2f8..6b20c01ee 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -14,8 +14,7 @@ class roles::ports_mirror(
     true    => ['*'],
     default => enclose_ipv6($listen_addr),
   }
-  $_addr_port_elements = $_enclosed_addresses.map |$a| { "${a}:80" }
-  $vhost_listen = join($_addr_port_elements, ' ')
+  $vhost_listen = $_enclosed_addresses.map |$a| { "${a}:80" } .join(' ')
 
   $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
   $archive_root = "${mirror_basedir_prefix}debian-ports"
diff --git a/modules/roles/manifests/static_mirror_web.pp b/modules/roles/manifests/static_mirror_web.pp
index 7895a59d2..8c04475b8 100644
--- a/modules/roles/manifests/static_mirror_web.pp
+++ b/modules/roles/manifests/static_mirror_web.pp
@@ -1,10 +1,18 @@
 # a static web mirror
+#
+# @param listen_addr IP addresses to have apache listen on
+# @param onion_service provide the onion service from this host
 class roles::static_mirror_web(
-  String  $vhost_listen = '*:80',
-  String  $vhost_listen_443 = '*:443',
+  Array[Stdlib::IP::Address] $listen_addr = [],
   Boolean $onion_service = false,
-  Optional[Stdlib::IP::Address] $onion_addr = undef,
 ) {
+  $_enclosed_addresses = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $vhost_listen     = $_enclosed_addresses.map |$a| { "${a}:80"  } .join(' ')
+  $vhost_listen_443 = $_enclosed_addresses.map |$a| { "${a}:443" } .join(' ')
+
   include roles::static_mirror
   include roles::weblog_provider
 
@@ -134,8 +142,9 @@ class roles::static_mirror_web(
 
 
   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 { 'd-i.debian.org'      : ensure => 'ifstatic', port => 80, target_port => 80, target_address => $onion_addr }
-- 
2.20.1