X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fports_mirror.pp;h=709dc5a171f85e4831a0427da5134f9c74c6eb6e;hb=0a5b5cce3089ae780a23c11849ef470f6df1567e;hp=80ca8b5d54659a332ed00bab59c6ef882a462e08;hpb=51bfbc36a29563fa089b58255add106a2e09ab60;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index 80ca8b5d5..709dc5a17 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -1,6 +1,9 @@
 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 [2001:67c:2564:a119::148:14]:80',
 		mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
@@ -11,12 +14,6 @@ class roles::ports_mirror {
 		mirror-isc => '149.20.4.15',
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian-ports',
-	}
-	$archive_cd_root = $::hostname ? {
-		default    => '/srv/mirrors/debian-ports-cd',
-	}
 
 	apache2::site { '010-ftp.ports.debian.org':
 		site   => 'ftp.ports.debian.org',