From: Julien Cristau <jcristau@debian.org>
Date: Wed, 5 Jul 2017 18:12:41 +0000 (+0200)
Subject: New ipv6 addresses for klecker
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=8f3280dc37053bf34c4c09cd615412f8a17e1a06;p=mirror%2Fdsa-puppet.git

New ipv6 addresses for klecker
---

diff --git a/modules/roles/manifests/debian_mirror.pp b/modules/roles/manifests/debian_mirror.pp
index 14ae35406..f6e569622 100644
--- a/modules/roles/manifests/debian_mirror.pp
+++ b/modules/roles/manifests/debian_mirror.pp
@@ -3,7 +3,7 @@ class roles::debian_mirror {
 
 	$vhost_listen = join([
 		$::hostname ? {
-			klecker    => '130.89.148.12:80 [2001:610:1908:b000::148:12]:80',
+			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',
diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index 684b74c7e..c178b1ef6 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -2,7 +2,7 @@ class roles::debug_mirror {
 	include roles::archvsync_base
 
 	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]: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',
diff --git a/modules/roles/manifests/ftp.pp b/modules/roles/manifests/ftp.pp
index 452c4597c..cede5429b 100644
--- a/modules/roles/manifests/ftp.pp
+++ b/modules/roles/manifests/ftp.pp
@@ -2,7 +2,7 @@ class roles::ftp {
 	# this is the FTP part of the roles::debian_mirror class
 
 	$binds = $::hostname ? {
-		klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]' ],
+		klecker => [ '130.89.148.12', '[2001:610:1908:b000::148:12]', '[2001:67c:2564:a119::148:12]' ],
 		default => [ '[::]' ],
 	}
 
diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index ccf34dbce..b6fc7006c 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -4,7 +4,8 @@ class roles::historical_mirror {
 
 	$binds = $::hostname ? {
 		gretchaninov  => ['209.87.16.41'   , '[2607:f8f0:614:1::1274:41]'          ],
-		klecker       => ['130.89.148.13'  , '[2001:610:1908:b000::148:13]'        ],
+		klecker       => ['130.89.148.13'  , '[2001:610:1908:b000::148:13]',
+		                  '[2001:67c:2564:a119::148:13]' ],
 		mirror-conova => ['217.196.149.234', '[2a02:16a8:dc41:100::234]'           ],
 		sibelius      => ['193.62.202.28'  , '[2001:630:206:4000:1a1a:0:c13e:ca1c]'],
 		default       => ['[::]'],
diff --git a/modules/roles/manifests/ports_mirror.pp b/modules/roles/manifests/ports_mirror.pp
index bd0d6c147..a2f5bfa8a 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -2,7 +2,7 @@ class roles::ports_mirror {
 	include roles::archvsync_base
 
 	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
 		mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
 		default => '*:80',
 	}
diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index 53fdf8334..2b0d6e16e 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -40,13 +40,13 @@ class roles::static_mirror {
 		default    => undef,
 	}
 	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80',
+		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
 		mirror-isc => '149.20.4.15:80 [2001:4f8:1:c::15]:80',
 		mirror-anu => '150.203.164.62:80 [2001:388:1034:2900::3e]:80',
 		default    => '*:80',
 	}
 	$vhost_listen_443 = $::hostname ? {
-		klecker    => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443',
+		klecker    => '130.89.148.14:443 [2001:610:1908:b000::148:14]:443 [2001:67c:2564:a119::148:14]:443',
 		mirror-isc => '149.20.4.15:443 [2001:4f8:1:c::15]:443',
 		mirror-anu => '150.203.164.62:443 [2001:388:1034:2900::3e]:443',
 		default    => '*:443',
diff --git a/modules/roles/manifests/syncproxy.pp b/modules/roles/manifests/syncproxy.pp
index 87a545100..0c1d99378 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -6,7 +6,8 @@ class roles::syncproxy {
 		'mirror-anu'   => [ '150.203.164.60', '[2001:388:1034:2900::3c]' ],
 		'mirror-isc'   => [ '149.20.4.16', '[2001:4f8:1:c::16]' ],
 		'mirror-umn'   => [ '128.101.240.216', '[2607:ea00:101:3c0b::1deb:216]' ],
-		'klecker'      => [ '130.89.148.10', '[2001:610:1908:b000::148:10]' ],
+		'klecker'      => [ '130.89.148.10', '[2001:610:1908:b000::148:10]',
+		                    '[2001:67c:2564:a119::148:10]' ],
 		'gretchaninov' => [ '209.87.16.40', '[2607:f8f0:614:1::1274:40]' ],
 		default        => [ '[::]' ],
 	}