X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=c6a5766d22acc14ba3e3e70f1f6d128ec040f029;hb=0b90b9722d512bc8e6bc0a90995b3ace1b1b68ed;hp=8ecc15bd26424b582c9026a01da8692e2c2006fd;hpb=622fcf7cc4d58bddec10e894cc3daf8efb6fca91;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 8ecc15bd2..c6a5766d2 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,35 +1,46 @@
 class roles::security_mirror {
-	$rsync_bind = $::hostname ? {
-		mirror-anu => '150.203.164.39', # XXX this will change to 61
-		mirror-isc => '149.20.20.19',
-		mirror-umn => '128.101.240.215',
-		default    => '',
-	}
-	$rsync_bind6 = $::hostname ? {
-		mirror-anu => '2001:388:1034:2900::3d', # XXX this will change to 3d
-		mirror-isc => '2001:4f8:8:36::1deb:19',
-		mirror-umn => '2607:ea00:101:3c0b::1deb:215',
-		default    => '',
+	include roles::archvsync_base
+
+	$binds = $::hostname ? {
+		mirror-anu      => [ '150.203.164.61', '[2001:388:1034:2900::3d]' ],
+		mirror-conova   => [ '217.196.149.233', '[2a02:16a8:dc41:100::233]' ],
+		mirror-isc      => [ '149.20.4.14', '[2001:4f8:1:c::14]' ],
+		mirror-umn      => [ '128.101.240.215', '[2607:ea00:101:3c0b::1deb:215]' ],
+		default         => [ '[::]' ],
 	}
 
-	include apache2::cache
+	include apache2::expires
+	include apache2::rewrite
+
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	include ferm::ftp_conntrack
-	vsftpd::site { 'security':
-		banner       => 'security.debian.org FTP server (vsftpd)',
-		logfile      => '/var/log/ftp/vsftpd-security.debian.org.log',
-		max_clients  => 200,
-		root         => '/srv/ftp.root/',
-	}
+	$mirrors = hiera('roles.security_mirror', {})
+	$fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
+	$hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
+
+	roles::mirror_health { 'security':
+		check_hosts   => $hosts_to_check,
+		check_service => 'security',
+		url           => 'http://security.backend.mirrors.debian.org/debian-security/dists/stable/updates/Release',
+		health_url    => 'http://security.backend.mirrors.debian.org/_health',
+        }
 
 	rsync::site { 'security':
 		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
 		max_clients => 100,
-		bind        => $rsync_bind,
-		bind6       => $rsync_bind6,
+		binds       => $binds,
+	}
+
+	$onion_v4_addr = hiera("roles.security_mirror", {})
+		.dig($::fqdn, 'onion_v4_address')
+	if $onion_v4_addr {
+		onion::service { 'security.debian.org':
+			port => 80,
+			target_port => 80,
+			target_address => $onion_v4_addr,
+		}
 	}
 }