X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebug_mirror.pp;h=828ee60a1df748b9e79c32d452b154a4d87c64a9;hb=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=4e9c6730477e3e0fbda37a54a82cb731403636e2;hpb=72dd53257640cad8c2734a8737e4d84d84fd37b6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index 4e9c67304..828ee60a1 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -1,6 +1,9 @@
 class roles::debug_mirror {
 	include roles::archvsync_base
 
+	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+	$archive_root = "${mirror_basedir_prefix}debian-debug"
+
 	$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',
@@ -12,9 +15,6 @@ class roles::debug_mirror {
 		mirror-isc => '149.20.4.15',
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian-debug',
-	}
 
 	apache2::site { '010-debug.mirrors.debian.org':
 		site   => 'debug.mirrors.debian.org',