X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fdebian_mirror.pp;h=14ae35406843a73b5d5dc470f7f41fb0b9132dec;hb=12332fbd95be46e7d6ca5dc584ea8be270a01324;hp=194e65d8f0a5642c3aeb6d34c6704a4e49c4888b;hpb=bb6fa3a8749bd6860ec6f167d62db9119434886a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 194e65d8f..14ae35406 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -1,17 +1,26 @@
 class roles::debian_mirror {
-	$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',
-		default => '*:80',
-	}
+	include roles::archvsync_base
+
+	$vhost_listen = join([
+		$::hostname ? {
+			klecker    => '130.89.148.12:80 [2001:610:1908:b000::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',
+			default => '*:80',
+		},
+		has_role('bgp') ? {
+			true => '193.31.7.2:80 [2a02:158:ffff:deb::2]:80',
+			default => '',
+		}], ' ')
 	$onion_v4_addr = $::hostname ? {
-		bilbao     => '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,
+		default    => '/srv/mirrors/debian',
 	}
 
 	apache2::site { '010-ftp.debian.org':