X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fhistorical_mirror.pp;h=86fbcb3bd132db5a0b72f6b52405b8c2d380877c;hb=58e1f2d7822889902465b505fa0698cc3f857a31;hp=eb3230a37d38dfb92a648882e6b458fdd747cddb;hpb=185058d5903683884231bdb5b28f27e0814b49c4;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index eb3230a37..86fbcb3bd 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -2,10 +2,12 @@ class roles::historical_mirror {
 	include roles::archvsync_base
 	include apache2::expires
 
+	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+	$archive_root = "${mirror_basedir_prefix}debian-archive"
+
 	$binds = $::hostname ? {
 		gretchaninov  => ['209.87.16.41'   , '[2607:f8f0:614:1::1274:41]'          ],
-		klecker       => ['130.89.148.13'  , '[2001:610:1908:b000::148:13]',
-		                  '[2001:67c:2564:a119::148:13]' ],
+		klecker       => ['130.89.148.13'  , '[2001:67c:2564:a119::148:13]'        ],
 		mirror-conova => ['217.196.149.234', '[2a02:16a8:dc41:100::234]'           ],
 		sibelius      => ['193.62.202.28'  , '[2001:630:206:4000:1a1a:0:c13e:ca1c]'],
 		default       => ['[::]'],
@@ -14,9 +16,6 @@ class roles::historical_mirror {
 	$onion_v4_addr = $::hostname ? {
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian-archive',
-	}
 
 	apache2::site { '010-archive.debian.org':
 		site   => 'archive.debian.org',