X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=c6a5766d22acc14ba3e3e70f1f6d128ec040f029;hb=4e8859da2c042d6a41d5eebf39c0c65cd17eebcb;hp=5e3ee78fbfb0203c4518ef7b69fc4a8521f4bcbf;hpb=ca0302fc180922a0843bd5f25fae104f14dff374;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 5e3ee78fb..c6a5766d2 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -1,30 +1,46 @@
 class roles::security_mirror {
+	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::expires
+	include apache2::rewrite
 
 	apache2::site { '010-security.debian.org':
 		site   => 'security.debian.org',
-		config => 'puppet:///modules/roles/security_mirror/security.debian.org'
+		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	$bind = $::hostname ? {
-		default => '',
-	}
+	$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'] }
 
-	$bind6 = $::hostname ? {
-		default => '',
-	}
+	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',
+        }
 
-	vsftpd::site { 'security':
-		source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-		logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
-		bind    => $bind,
+	rsync::site { 'security':
+		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
+		max_clients => 100,
+		binds       => $binds,
 	}
 
-	if $bind6 {
-		vsftpd::site { 'security-v6':
-			source  => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
-			logfile => '/var/log/ftp/vsftpd-security.debian.org.log',
-			bind    => $bind6,
+	$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,
 		}
 	}
-
 }