X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fhistorical_mirror.pp;h=3ba35393020f841c70d683c4a77e7839f7317314;hb=f6a4eb4d0eb7078ffb261191abab23801e12db17;hp=f54ebb929cbcb487a308dcedcb835f1a35b73b48;hpb=0b0595ec6b5ebba083571c82cb86ecc65d6f8844;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index f54ebb929..3ba353930 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -1,22 +1,44 @@
 class roles::historical_mirror {
+	include roles::archvsync_base
 	include apache2::expires
 
-	$vhost_listen = $::hostname ? {
-		klecker => '130.89.148.13:80 2001:610:1908:b000::148:13:80',
-		default => '*:80',
+	$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:67c:2564:a119::148:13]'        ],
+		schmelzer     => ['217.196.149.234', '[2a02:16a8:dc41:100::234]'           ],
+		sibelius      => ['193.62.202.28'  , '[2001:630:206:4000:1a1a:0:c13e:ca1c]'],
+		default       => ['[::]'],
 	}
+
 	$onion_v4_addr = $::hostname ? {
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian-archive',
-	}
 
 	apache2::site { '010-archive.debian.org':
 		site   => 'archive.debian.org',
 		content => template('roles/apache-archive.debian.org.erb'),
 	}
 
+	if has_role('historical_master') {
+		$sslname = 'archive-master.debian.org'
+		ssl::service { $sslname:
+			key      => true,
+			tlsaport => [],
+		}
+	} else {
+		$sslname = undef
+	}
+
+	rsync::site { 'archive':
+		content     => template('roles/historical_mirror/rsyncd.conf.erb'),
+		max_clients => 100,
+		sslname     => $sslname,
+		binds       => $binds,
+	}
+
 	if has_role('historical_mirror_onion') {
 		if ! $onion_v4_addr {
 			fail("Do not have an onion_v4_addr set for $::hostname.")