X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=1eae31085f5c183ff5490b956c706f98426ee87e;hb=b244b8852b6824886daaa28c76c3fda13f029ed9;hp=6273a57ba15c32854c709436bd8689afa430a2dd;hpb=78744dd0999177374e593a1d92be6896512f7fe6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 6273a57ba..1eae31085 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,9 +1,13 @@
 class roles::debian_mirror {
 	include roles::archvsync_base
 
+	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+	$archive_root = "${mirror_basedir_prefix}debian"
+
 	$vhost_listen = join([
 		$::hostname ? {
-			klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80',
+			klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80',
+			mirror-bytemark => '5.153.231.45:80 [2001:41c8:1000:21::21:45]:80',
 			mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
 			mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
 			default => '*:80',
@@ -13,14 +17,11 @@ class roles::debian_mirror {
 			default => '',
 		}], ' ')
 	$onion_v4_addr = $::hostname ? {
-		mirror-bytemark => '5.153.231.37',
+		mirror-bytemark => '5.153.231.45',
 		klecker    => '130.89.148.12',
 		mirror-isc => '149.20.4.15',
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian',
-	}
 
 	apache2::site { '010-ftp.debian.org':
 		site   => 'ftp.debian.org',