From: Julien Cristau <jcristau@debian.org>
Date: Tue, 16 Oct 2018 08:02:40 +0000 (+0200)
Subject: Remove old klecker IP addresses
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=f7f9a79a4a29afeb59229670b2ad92bb9c209f92;p=mirror%2Fdsa-puppet.git

Remove old klecker IP addresses
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 1082e451f..4eac6ea36 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -255,7 +255,6 @@ roles:
     klecker.debian.org:
       listen-addresses:
         - '130.89.148.12:80'
-        - '[2001:610:1908:b000::148:12]:80'
         - '[2001:67c:2564:a119::148:12]:80'
       onion_v4_address: 130.89.148.12
     mirror-accumu.debian.org:
diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp
index b43d66ac3..dddf52019 100644
--- a/modules/roles/manifests/debug_mirror.pp
+++ b/modules/roles/manifests/debug_mirror.pp
@@ -5,7 +5,7 @@ class roles::debug_mirror {
 	$archive_root = "${mirror_basedir_prefix}debian-debug"
 
 	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
+		klecker    => '130.89.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',
 		mirror-accumu => '*:80',
diff --git a/modules/roles/manifests/historical_mirror.pp b/modules/roles/manifests/historical_mirror.pp
index e3ed4ef6c..86fbcb3bd 100644
--- a/modules/roles/manifests/historical_mirror.pp
+++ b/modules/roles/manifests/historical_mirror.pp
@@ -7,8 +7,7 @@ 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]',
-		                  '[2001:67c:2564:a119::148:13]' ],
+		klecker       => ['130.89.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 709dc5a17..323cb3a3c 100644
--- a/modules/roles/manifests/ports_mirror.pp
+++ b/modules/roles/manifests/ports_mirror.pp
@@ -5,7 +5,7 @@ class roles::ports_mirror {
 	$archive_root = "${mirror_basedir_prefix}debian-ports"
 
 	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
+		klecker    => '130.89.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 8cead7743..cb653d0e0 100644
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -38,13 +38,13 @@ class roles::static_mirror {
 		default    => undef,
 	}
 	$vhost_listen = $::hostname ? {
-		klecker    => '130.89.148.14:80 [2001:610:1908:b000::148:14]:80 [2001:67c:2564:a119::148:14]:80',
+		klecker    => '130.89.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 [2001:67c:2564:a119::148:14]:443',
+		klecker    => '130.89.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 146fcda8b..c092651df 100644
--- a/modules/roles/manifests/syncproxy.pp
+++ b/modules/roles/manifests/syncproxy.pp
@@ -9,8 +9,7 @@ class roles::syncproxy {
 		'mirror-conova' => [ '217.196.149.237', '[2a02:16a8:dc41:100::237]' ],
 		'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]',
-		                    '[2001:67c:2564:a119::148:10]' ],
+		'klecker'      => [ '130.89.148.10', '[2001:67c:2564:a119::148:10]' ],
 		'gretchaninov' => [ '209.87.16.40', '[2607:f8f0:614:1::1274:40]' ],
 		default        => [ '[::]' ],
 	}