Remove IP addresses from ports_mirror role and move them to hiera

diff --git a/hieradata/nodes/klecker.debian.org.yaml b/hieradata/nodes/klecker.debian.org.yaml
index 49bc02e..4ac182c 100644 (file)
--- a/hieradata/nodes/klecker.debian.org.yaml
+++ b/hieradata/nodes/klecker.debian.org.yaml
@@ -3,4 +3,6 @@ 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::onion_service: true
+roles::ports_mirror::onion_addr: '130.89.148.14'

diff --git a/hieradata/nodes/mirror-isc.debian.org.yaml b/hieradata/nodes/mirror-isc.debian.org.yaml
index 49bc02e..08a059b 100644 (file)
--- a/hieradata/nodes/mirror-isc.debian.org.yaml
+++ b/hieradata/nodes/mirror-isc.debian.org.yaml
@@ -3,4 +3,6 @@ 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::onion_service: true
+roles::ports_mirror::onion_addr: '149.20.4.15'

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 9b538ce..d8ae988 100644 (file)
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,5 +1,7 @@
 class roles::ports_mirror(
+  String  $vhost_listen = '*:80',
   Boolean $onion_service = false,
+  Optional[Stdlib::IP::Address] $onion_addr = undef,
 ) {
   include roles::archvsync_base
 
@@ -8,32 +10,20 @@ class roles::ports_mirror(
   $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
   $archive_root = "${mirror_basedir_prefix}debian-ports"
 
-  $vhost_listen = $::hostname ? {
-    klecker    => '130.89.148.14:80 [2001:67c:2564:a119::148:14]:80',
-    mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
-    default    => '*:80',
-  }
-
   apache2::site { '010-ftp.ports.debian.org':
     site    => 'ftp.ports.debian.org',
     content => template('roles/apache-ftp.ports.debian.org.erb'),
   }
 
   if $onion_service {
-    $onion_v4_addr = $::hostname ? {
-      klecker    => '130.89.148.14',
-      mirror-isc => '149.20.4.15',
-      default    => undef,
-    }
-
-    if ! $onion_v4_addr {
-      fail("Do not have an onion_v4_addr set for $::hostname.")
+    if ! $onion_addr {
+      fail("Do not have an onion_addr set for ${::hostname}.")
     }
 
     onion::service { 'ftp.ports.debian.org':
       port           => 80,
       target_port    => 80,
-      target_address => $onion_v4_addr,
+      target_address => $onion_addr,
     }
   }
 }