X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=e790c882670ab2f0ba8e644eb8172b03e5ca0a8e;hb=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=d49489e84923da99dcb943ffe3279b3aab2dbfaa;hpb=a3f27248848dc5726cdd2708aeb885953e6369f6;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index d49489e84..e790c8826 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,21 +1,27 @@
 class roles::debian_mirror {
 	include roles::archvsync_base
 
-	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]: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',
-		default => '*:80',
-	}
+	$mirror_basedir_prefix = hiera('role_config__mirrors.mirror_basedir_prefix')
+	$archive_root = "${mirror_basedir_prefix}debian"
+
+	$vhost_listen = join([
+		$::hostname ? {
+			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') ? {
+			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
+			default => '',
+		}], ' ')
 	$onion_v4_addr = $::hostname ? {
-		mirror-bytemark => '5.153.231.37',
+		mirror-bytemark => '5.153.231.45',
 		klecker    => '130.89.148.12',
 		mirror-isc => '149.20.4.15',
 		default    => undef,
 	}
-	$archive_root = $::hostname ? {
-		default    => '/srv/mirrors/debian',
-	}
 
 	apache2::site { '010-ftp.debian.org':
 		site   => 'ftp.debian.org',
@@ -33,4 +39,11 @@ class roles::debian_mirror {
 			target_address => $onion_v4_addr,
 		}
 	}
+
+        roles::mirror_health { 'ftp':
+		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',
+        }
 }