X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=7463c8572e32d1bfa17549b39e2f4fa94d58e9bd;hb=3796622f7a39dee1120b7d11500d303451e6ff6a;hp=9b538cede1e503e72c376c31e1f9a1dd2a47f6b2;hpb=81897130d25eeea37666cf08a46176993c17a3c3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 9b538cede..7463c8572 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,39 +1,43 @@
+# 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(
+  Array[Stdlib::IP::Address] $listen_addr = [],
   Boolean $onion_service = false,
 ) {
   include roles::archvsync_base
-
   include apache2
 
+  $_enclosed_addresses = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $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"
 
-  $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,
+    $onion_addr = empty($listen_addr) ? {
+      true    => $base::public_address,
+      default => filter_ipv4($listen_addr)[0]
     }
-
-    if ! $onion_v4_addr {
-      fail("Do not have an onion_v4_addr set for $::hostname.")
+    if ! $onion_addr {
+      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':
       port           => 80,
       target_port    => 80,
-      target_address => $onion_v4_addr,
+      target_address => $onion_addr,
     }
   }
+
+  Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>>
 }