X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=709dc5a171f85e4831a0427da5134f9c74c6eb6e;hb=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=020041141f5acccacf6d1abf63fe9a46708da10d;hpb=65139996ecd9fed4bb7498e6ac9e73fdaa6920ac;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 020041141..709dc5a17 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,12 +1,34 @@
 class roles::ports_mirror {
+	include roles::archvsync_base
+
+	$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:610:1908:b000::148:14]:80',
-		mirror-isc => '149.20.20.22:80 [2001:4f8:8:36::1deb:22]:80',
+		klecker    => '130.89.148.14:80 [2001:610:1908:b000::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',
 	}
+	$onion_v4_addr = $::hostname ? {
+		klecker    => '130.89.148.14',
+		mirror-isc => '149.20.4.15',
+		default    => undef,
+	}
 
-	apache2::site { '010-ports.mirrors.debian.org':
-		site   => 'ports.mirrors.debian.org',
+	apache2::site { '010-ftp.ports.debian.org':
+		site   => 'ftp.ports.debian.org',
 		content => template('roles/apache-ftp.ports.debian.org.erb'),
 	}
+
+	if has_role('static_mirror_onion') {
+		if ! $onion_v4_addr {
+			fail("Do not have an onion_v4_addr set for $::hostname.")
+		}
+
+		onion::service { 'ftp.ports.debian.org':
+			port => 80,
+			target_port => 80,
+			target_address => $onion_v4_addr,
+		}
+	}
 }