X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fhistorical_mirror.pp;h=ccf34dbce4f33d7aa72dad29d23b8939ea5e1769;hb=12332fbd95be46e7d6ca5dc584ea8be270a01324;hp=25edb230adb06f559ff00ab417415b01cf98ceed;hpb=159f9d320359cb17eb3e10006ab1ace4f4900df6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index 25edb230a..ccf34dbce 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -1,7 +1,15 @@
 class roles::historical_mirror {
-	$vhost_listen = $::hostname ? {
-		default => '*:80',
+	include roles::archvsync_base
+	include apache2::expires
+
+	$binds = $::hostname ? {
+		gretchaninov  => ['209.87.16.41'   , '[2607:f8f0:614:1::1274:41]'          ],
+		klecker       => ['130.89.148.13'  , '[2001:610:1908:b000::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       => ['[::]'],
 	}
+
 	$onion_v4_addr = $::hostname ? {
 		default    => undef,
 	}
@@ -14,6 +22,23 @@ class roles::historical_mirror {
 		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':
+		source      => 'puppet:///modules/roles/historical_mirror/rsyncd.conf',
+		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.")