X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Fdebug_mirror.pp;h=8f1407d3c4f3f37cf4e78868eaf33e3700548013;hb=33a685862291e6f3c0c7f9df702b930430bbe419;hp=94c73a57700f5e2a1e9f5d51152277cad6eceb0c;hpb=0f978b5d766ecb41aaabd0042c090138da96c04a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index 94c73a577..8f1407d3c 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -1,29 +1,51 @@
-class roles::debug_mirror {
-	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
-		mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]:80',
-		default => '*:80',
-	}
-	$onion_v4_addr = $::hostname ? {
-		klecker    => '130.89.148.14',
-		mirror-isc => '149.20.20.22',
-		default    => undef,
-	}
+# a mirror for debug.debian.org
+#
+# @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::debug_mirror(
+  Array[Stdlib::IP::Address] $listen_addr = [],
+  Boolean $onion_service = false,
+  Optional[String] $healthcheck_name = undef,
+) {
+  include roles::archvsync_base
+  include apache2
 
-	apache2::site { '010-debug.mirrors.debian.org':
-		site   => 'debug.mirrors.debian.org',
-		content => template('roles/apache-debug.mirrors.debian.org.erb'),
-	}
+  $_enclosed_addresses = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $vhost_listen = $_enclosed_addresses.map |$a| { "${a}:80" } .join(' ')
 
-	if has_role('static_mirror_onion') {
-		if ! $onion_v4_addr {
-			fail("Do not have an onion_v4_addr set for $::hostname.")
-		}
+  $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+  $archive_root = "${mirror_basedir_prefix}debian-debug"
 
-		onion::service { 'debug.mirrors.debian.org':
-			port => 80,
-			target_port => 80,
-			target_address => $onion_v4_addr,
-		}
-	}
+  apache2::site { '010-debug.mirrors.debian.org':
+    site    => 'debug.mirrors.debian.org',
+    content => template('roles/apache-debug.mirrors.debian.org.erb'),
+  }
+
+  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 { 'debug.mirrors.debian.org':
+      port           => 80,
+      target_port    => 80,
+      target_address => $onion_addr,
+    }
+  }
+
+  Ferm::Rule::Simple <<| tag == 'ssh::server::from::ftp_master' |>>
+
+  mirror_health::service { 'debug':
+    this_host_service_name => $healthcheck_name,
+    url                    => 'http://debug.backend.mirrors.debian.org/debian-debug/dists/sid-debug/Release',
+    health_url             => 'http://debug.backend.mirrors.debian.org/_health',
+  }
 }