Merge branch 'master' of git+ssh://git2.debian.org/dsa/dsa-puppet

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

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index da2f07c..e790c88 100644 (file)
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -6,10 +6,10 @@ class roles::debian_mirror {
 
        $vhost_listen = join([
                $::hostname ? {
-                       klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80',
-                       mirror-bytemark => '5.153.231.45:80 [2001:41c8:1000:21::21:45]:80',
-                       mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
-                       mirror-conova => '217.196.149.232:80 [2a02:16a8:dc41:100::232]:80',
+                       klecker    => '130.89.148.12:80 127.0.0.1:80 [2001:610:1908:b000::148:12]:80 [2001:67c:2564:a119::148:12]:80 [::1]:80',
+                       mirror-bytemark => '5.153.231.45:80 127.0.0.1:80 [2001:41c8:1000:21::21:45]:80 [::1]:80',
+                       mirror-isc => '149.20.4.15:80 127.0.0.1:80 [2001:4f8:1:c::15]:80 [::1]:80',
+                       mirror-conova => '217.196.149.232:80 127.0.0.1:80 [2a02:16a8:dc41:100::232]:80 [::1]:80',
                        default => '*:80',
                },
                has_role('bgp') ? {
@@ -41,8 +41,9 @@ class roles::debian_mirror {
        }
 
         roles::mirror_health { 'ftp':
-               check_hosts   => ['mirror-bytemark-debian.debian.org', 'mirror-conova-debian.debian.org, mirror-isc3.debian.org', 'mirror-accumu.debian.org', 'mirror-skroutz.debian.org', 'klecker-ftp.debian.org'],
+               check_hosts   => ['accumu.debian.backend.mirrors.debian.org', 'bytemark.debian.backend.mirrors.debian.org', 'conova.debian.backend.mirrors.debian.org', 'skroutz.debian.backend.mirrors.debian.org'],
                check_service => 'ftp',
                url           => 'http://debian.backend.mirrors.debian.org/debian/dists/sid/Release',
+               health_url    => 'http://debian.backend.mirrors.debian.org/_health',
         }
 }