X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=39b3b50a43a1804bcf69472cc6343904dd30aa75;hb=bf716a4daf9652bc9d1b77deac83a2b384fd78bc;hp=31cf1b5686c9857168b980c0c5b5c2722b3ed3c6;hpb=0f978b5d766ecb41aaabd0042c090138da96c04a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 31cf1b568..39b3b50a4 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,29 +1,44 @@
-class roles::ports_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 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
 
-	apache2::site { '010-ftp.ports.debian.org':
-		site   => 'ftp.ports.debian.org',
-		content => template('roles/apache-ftp.ports.debian.org.erb'),
-	}
+  include apache2
 
-	if has_role('static_mirror_onion') {
-		if ! $onion_v4_addr {
-			fail("Do not have an onion_v4_addr set for $::hostname.")
-		}
+  $_enclosed_addresses = empty($listen_addr) ? {
+    true    => ['*'],
+    default => enclose_ipv6($listen_addr),
+  }
+  $vhost_listen = $_enclosed_addresses.map |$a| { "${a}:80" } .join(' ')
 
-		onion::service { 'ftp.ports.debian.org':
-			port => 80,
-			target_port => 80,
-			target_address => $onion_v4_addr,
-		}
-	}
+  $mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+  $archive_root = "${mirror_basedir_prefix}debian-ports"
+
+  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_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.ports.debian.org':
+      port           => 80,
+      target_port    => 80,
+      target_address => $onion_addr,
+    }
+  }
+
+  Ferm::Rule::Simple <<| tag == 'ssh::server::from::syncproxy' |>>
 }