X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=472a1458edbf324e49a8767b52622e17f0646b53;hb=da4d916ea39b5fa0115af28af54d379e7f859059;hp=603c3c7907da2022ecd1a6d232201092c12633b3;hpb=d0f5d088b88902979760c97ab31fd8cba677296b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 603c3c790..472a1458e 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,19 +36,23 @@ class roles::security_mirror {
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	if has_role('security_mirror_no_ftp') {
-		vsftpd::site { 'security':
-			ensure => absent,
-			root   => '/nonexistent',
-		}
-	} else {
-		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/',
-			binds        => $binds,
-		}
+        # roles is a list of hashes, which needs to be unpacked into a regular hash
+        $mirrors = hiera('roles.security_mirror', [])
+        # unpack $mirrors and construct a hash
+        $m2 = Hash($mirrors.map |$h| { $h.map |$k, $v| { [$k, $v] }[0]})
+        $fastly_mirrors = $m2.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/dists/sid/Release',
+		health_url    => 'http://security.backend.mirrors.debian.org/_health',
+        }
+
+	vsftpd::site { 'security':
+		ensure => absent,
+		root   => '/nonexistent',
 	}
 
 	rsync::site { 'security':