Retire ftp.d.o role, it is unused

[mirror/dsa-puppet.git] / modules / roles / manifests / security_mirror.pp

diff --git a/modules/roles/manifests/security_mirror.pp b/modules/roles/manifests/security_mirror.pp
index 2012d03..d562024 100644 (file)
--- a/modules/roles/manifests/security_mirror.pp
+++ b/modules/roles/manifests/security_mirror.pp
@@ -36,8 +36,12 @@ class roles::security_mirror {
                content => template('roles/security_mirror/security.debian.org.erb')
        }
 
-        roles::mirror_health { 'security':
-               check_hosts   => hiera('roles::security_mirror'),
+       $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/dists/sid/Release',
                health_url    => 'http://security.backend.mirrors.debian.org/_health',
@@ -54,19 +58,9 @@ class roles::security_mirror {
                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,