X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fhistorical_mirror.pp;h=e3ed4ef6c850223c4c6f5902544119582217c241;hb=b244b8852b6824886daaa28c76c3fda13f029ed9;hp=5036e8fbce56c2b860bde6e54d0f53010c8bdeed;hpb=b529b139a60ea8355089511737c8264185d8d074;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index 5036e8fbc..e3ed4ef6c 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -2,9 +2,13 @@ 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]'        ],
+		klecker       => ['130.89.148.13'  , '[2001:610:1908:b000::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       => ['[::]'],
@@ -13,9 +17,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',
@@ -32,8 +33,8 @@ class roles::historical_mirror {
 		$sslname = undef
 	}
 
-	rsync::site_systemd { 'archive':
-		source      => 'puppet:///modules/roles/historical_mirror/rsyncd.conf',
+	rsync::site { 'archive':
+		content     => template('roles/historical_mirror/rsyncd.conf.erb'),
 		max_clients => 100,
 		sslname     => $sslname,
 		binds       => $binds,