X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fsecurity_mirror.pp;h=9bb6139073defc34efc4d68d45424125d461e036;hb=7a1f45cf027a1459319e73f486983bbcbf51772b;hp=9ac92709cf0cfcafae92b2d0ee2b220e7d790293;hpb=2f4f1c9a616b4b92a598440958121d4a7e83356c;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 9ac92709c..9bb613907 100644
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,44 +36,26 @@ class roles::security_mirror {
 		content => template('roles/security_mirror/security.debian.org.erb')
 	}
 
-	$mirrors = hiera_hash('roles::security_mirror',[])
-	notice("Mirrors: ${mirrors}")
+	$mirrors = hiera('roles.security_mirror', {})
 	$fastly_mirrors = $mirrors.filter |$h| { $h[1]['fastly-backend'] }
-	notice("Fastly Mirrors: ${fastly_mirrors}")
 	$hosts_to_check = $fastly_mirrors.map |$h| { $h[1]['service-hostname'] }
-	notice("Fastly Mirrors: ${hosts_to_check}")
 
-        roles::mirror_health { 'security':
+	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':
 		source      => 'puppet:///modules/roles/security_mirror/rsyncd.conf',
 		max_clients => 100,
 		binds       => $binds,
 	}
 
-	$onion_v4_addr = $::hostname ? {
-		mirror-anu => '150.203.164.61',
-		mirror-isc => '149.20.4.14',
-		mirror-umn => '128.101.240.215',
-		villa      => '212.211.132.32',
-		lobos      => '212.211.132.250',
-		default   => undef,
-	}
-	if has_role('security_mirror_onion') {
-		if ! $onion_v4_addr {
-			fail("Do not have an onion_v4_addr set for $::hostname.")
-		}
-
+	$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,