X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=45f6480cc0a8d369fa7757d72460dc7bd1e286ef;hb=d25a2c76158604d7f45e732f3655082376231811;hp=7cf72547b7ce2e61d712e005044c48865671e8a0;hpb=8532689c735ba87e8c00161224e068c2ba06f640;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 7cf72547b..45f6480cc 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,45 +1,51 @@
-class roles::debian_mirror {
+# an ftp.debian.org mirror/cdn backend
+#
+# @param listen_addr IP addresses to have apache listen on
+# @param onion_service provide the onion service from this host
+# @param healthcheck_name name to access this node in the health checker
+class roles::debian_mirror(
+  Array[Stdlib::IP::Address] $listen_addr = [],
+  Boolean $onion_service = false,
+  Optional[String] $healthcheck_name = undef,
+) {
   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"
-  $listen_addresses = hiera('roles.debian_mirror')
-    .dig($::fqdn, 'listen-addresses')
-    .then |$a| { $a }
-    .lest || { ['*:80'] }
-
-  $vhost_listen = join([
-    *$listen_addresses,
-    has_role('bgp') ? {
-      true    => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
-      default => '',
-    }], ' ')
 
   apache2::site { '010-ftp.debian.org':
     site    => 'ftp.debian.org',
     content => template('roles/apache-ftp.debian.org.erb'),
   }
 
-  $onion_v4_addr = hiera('roles.debian_mirror', {})
-    .dig($::fqdn, 'onion_v4_address')
-  if $onion_v4_addr {
+  if $onion_service {
+    $onion_addr = empty($listen_addr) ? {
+      true    => $base::public_address,
+      default => filter_ipv4($listen_addr)[0]
+    }
+    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.debian.org':
       port           => 80,
       target_port    => 80,
-      target_address => $onion_v4_addr,
+      target_address => $onion_addr,
     }
   }
 
-  $hosts_to_check = hiera('roles.debian_mirror', {})
-    .filter |$h| { $h[1]['fastly-backend'] }
-    .map |$h| { $h[1]['service-hostname'] }
+  Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>>
 
-  roles::mirror_health { 'ftp':
-    check_hosts   => $hosts_to_check,
-    check_service => 'ftp',
-    url           => 'http://debian.backend.mirrors.debian.org/debian/dists/sid/Release',
-    health_url    => 'http://debian.backend.mirrors.debian.org/_health',
+  mirror_health::service { 'ftp':
+    this_host_service_name => $healthcheck_name,
+    url                    => 'http://debian.backend.mirrors.debian.org/debian/dists/sid/Release',
+    health_url             => 'http://debian.backend.mirrors.debian.org/_health',
   }
-
-  Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>>
 }