From 1d30717c66dfcaa0e97b4e23042b73623d4eb468 Mon Sep 17 00:00:00 2001
From: Jelle van der Waa <jelle@archlinux.org>
Date: Thu, 30 Jul 2020 22:47:42 +0200
Subject: [PATCH] Remove jpn/repro2 as they no longer respond
Both boxes died and are no longer responsive, retire them.
---
README.md | 6 ++---
docs/ssh-hostkeys.txt | 22 -------------------
docs/ssh-known_hosts.txt | 10 ---------
host_vars/jpn.mirror.pkgbuild.com | 8 -------
hosts | 5 -----
.../templates/nginx.d.conf.j2 | 2 --
6 files changed, 3 insertions(+), 50 deletions(-)
delete mode 100644 host_vars/jpn.mirror.pkgbuild.com
diff --git a/README.md b/README.md
index 1639bea62..3fc2638ac 100644
--- a/README.md
+++ b/README.md
@@ -240,9 +240,9 @@ So to set up this server from scratch, run:
### reproducible.archlinux.org
#### Services
- - Runs a master rebuilderd instance with two PIA workers (repro1.pkgbuild.com,
- repro2.pkgbuild.com and repro3.pkgbuild.com).
- repro3.pkgbuild.com is packet.net machine which runs Ubuntu.
+ - Runs a master rebuilderd instance two workers:
+ - repro1.pkgbuild.com (PIA worker)
+ - repro3.pkgbuild.com (packet.net machine which runs Ubuntu)
### runner1.archlinux.org
diff --git a/docs/ssh-hostkeys.txt b/docs/ssh-hostkeys.txt
index 40a8b4c27..89d87d918 100644
--- a/docs/ssh-hostkeys.txt
+++ b/docs/ssh-hostkeys.txt
@@ -108,17 +108,6 @@
256 MD5:e2:34:b1:dc:24:00:45:08:4a:62:48:17:b2:69:23:2d root@archlinux-packer (ED25519)
3072 MD5:50:c8:93:43:05:d5:73:a4:84:b1:07:66:a7:20:a5:79 root@archlinux-packer (RSA)
-# jpn.mirror.pkgbuild.com
-1024 SHA256:CH1c99PrdAOTd0AKjoPwZHSBvQpNvRummeW3JhG2BIQ root@archlinux (DSA)
-256 SHA256:zySS1V6LkHPihEJRDQlGA0Hd6OEEBNnXRgsMJLL4hnY root@archlinux (ECDSA)
-256 SHA256:YY8kgSj1KFRCl0zoqdI7p+wYacOpqvMJZb0sSC5Pj50 root@archlinux (ED25519)
-2048 SHA256:B2Zjycz7Zb2RvKlKjZwWwbGvfAUu1sH4oemdu48YHK4 root@archlinux (RSA)
-
-1024 MD5:4a:82:83:e6:02:f2:6c:da:b4:65:40:b7:4f:ec:97:32 root@archlinux (DSA)
-256 MD5:5b:ad:df:44:85:56:75:3e:45:76:82:36:dc:7c:52:f3 root@archlinux (ECDSA)
-256 MD5:51:37:92:2a:2e:29:3c:c6:f1:6c:5e:67:9c:64:d4:b1 root@archlinux (ED25519)
-2048 MD5:4e:ed:97:61:09:0f:ee:97:85:09:80:6d:02:5e:28:d1 root@archlinux (RSA)
-
# luna.archlinux.org
1024 SHA256:9Nqu9y1LhT3L3Kd6J9CSyuOc1AdGWo0eLsPxoc5bpaw root@alderaan (DSA)
256 SHA256:L71Q91yHwmHPYYkJMDgj0xmUuw16qFOhJbBr1mzsiOI root@alderaan (ECDSA)
@@ -218,17 +207,6 @@
256 MD5:9c:47:85:f4:e4:19:42:92:7a:b1:dd:de:f5:3e:74:d6 root@archlinux (ED25519)
2048 MD5:e4:e1:d2:00:1b:96:9c:60:60:ac:a1:32:97:3b:1d:7c root@archlinux (RSA)
-# repro2.pkgbuild.com
-1024 SHA256:vQa2qPFZi5uaG4xFGU9TBTAl/ojG0mPV+VjrpQBjid8 root@archlinux (DSA)
-256 SHA256:IQeaJ5RyVuxahJLEplC1bp/9TEfbvc3moHFCXQnjwsQ root@archlinux (ECDSA)
-256 SHA256:AIYSDQNuqtWJTF5qs2nEon8zoJYP6mGNFrWvuNHVyyY root@archlinux (ED25519)
-2048 SHA256:SU6wcg6UJsyqB4tDTECIupsqzz36DVm5cdjvDy2pOLU root@archlinux (RSA)
-
-1024 MD5:46:8d:e8:5a:9e:a4:a4:80:cd:08:c4:d1:2d:81:e0:09 root@archlinux (DSA)
-256 MD5:d0:48:7c:9b:2c:6c:29:f4:aa:2c:f7:e8:2d:ff:66:4f root@archlinux (ECDSA)
-256 MD5:be:ca:42:e7:aa:ed:7b:20:ea:0c:c0:05:0d:07:13:fa root@archlinux (ED25519)
-2048 MD5:4a:d4:7b:c7:78:7b:90:33:45:5a:99:1a:8d:15:32:8d root@archlinux (RSA)
-
# reproducible.archlinux.org
1024 SHA256:3HoA8rGGureKWKaIZst+Dc6f7yrf3Wfn5PO1HFMl35E root@archlinux-packer (DSA)
256 SHA256:Yp3GHPq6GZZWUBv13XPiXciAbDFPH4XnEVHzR3/whUw root@archlinux-packer (ECDSA)
diff --git a/docs/ssh-known_hosts.txt b/docs/ssh-known_hosts.txt
index e6bc81193..31ceb1430 100644
--- a/docs/ssh-known_hosts.txt
+++ b/docs/ssh-known_hosts.txt
@@ -48,11 +48,6 @@ homedir.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDuQbGoCSIPisaZeqtJhM
homedir.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP4Wb9DA2Ni2QyTnMXRKI52puuhyuVqxKGQ5xmk36Xxj4OeTlILXIwfQ8k/Ywovs1izNs+xqLMF7DqbE8sXChKY=
homedir.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPxEHvFCXujU6s4eW0U79olHnNZta9WWC9SH/Nq6vTp0
-# jpn.mirror.pkgbuild.com
-jpn.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNkLde+NVPRuPBPRVUcLchkcsWJajOBhAfd1oS/dbDvUpfL2sSRDVVUUgMC3ASd5aFZ1tXzfKpon6nHQwTtsOLE=
-jpn.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcFeEm+l/UIfe8qOkxVzzlbP0du8fcfaP/DdXdMz1RKaBmQPSLFdUrT5JulKIPeOom1wOaE8MCSZnzwge0W7MoaSDfrieTwkogZYvLOOEjUec7rFeOnFy2R4P9xvb+ThT1za/Ruy+fi2e7NX9SWehUKF3xnI35PftrrVWKVk6RCr3McsbdjY0Gi7+HNcIcP5nkeibrLaiTxq/NV73Xx46MRjnMarBSyiaj8U3iR9noCxKPflOJufADhRjTbaaAEIPlVTSXG47icYaYmPJ4ZgNGGeSZblWQFw5N9WeF1vhgqWjdqNhoH9D++v0o48gJU+I4/nkG/a/+Rfgdfa/1xchP
-jpn.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICPbhGRm3pw3ryHBuBVj+5W5zqkw3FRKeFgutZKu25rU
-
# luna.archlinux.org
luna.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOZAVWmj2k+dHTfyum7FyIivGcVUkDFHaXmPNxDwF7l8TvkAN8VDQJHEEGJhALMYtNsQ+kt0gksSh4HZqj9n5hI=
luna.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDErOc9MQyj8vf20sZrcVOU+bxfa6B0DVl28pUdG+03seGM+bTVT84HnCcKwz7iASvGSJSAWfzYUQa6Gq8JuDWATd419L8Rtou0UEoK30c9oprGfCmB4extsFkEpMDihnvpUyK/qwBukCY8WxRx9MsZAVgmyQSt3ibBrExnm0+RckctYlJf19/LF+W1ckzNcnbG5Yc/54W7/B2P4iCglniYZMjQpfVPALVc2Iew0GpEWj0wQbpxenPgOZWDgFcQCYxHGgCVUaBSTcbeT4CgwqI4O1+P2X/JVkdwYfD4+j99VQAlA5z+jsCsacMqRiWSu+p7urCED2VIoApg2fffwtv3
@@ -98,11 +93,6 @@ repro1.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCppbY7QCPHwcoKFUXvNu/E
repro1.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBPSOqDIzGRsK3tr54P0thtJFwyKfqxcLzADTizrqgS5hOZrgn9zzjCDchXEfp/pEIEt3vZ/lMp7sUYvmAk+COHg=
repro1.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICvoV2b8lsCLBrqx5tZbhZeuuZQupVJqbVXI6Gz7NNoI
-# repro2.pkgbuild.com
-repro2.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC0k68ZYb9taeaGcWV5eUpD7trrIsoX1nMXUYfcg1u/QV36sbusX2Uk8H14yEVVg3ZusGqqYkPBUvO75fvwHxME6yGWM9bqRP9kqOV+yIN7EBLh0j/Emsz9ya8Bh/MKW3TU0KjzhKP5oADNQ09FoBppeUcRmlRgHczSFUDTAJ7v37Sp30kf5abqdI+OfXxFWBg/KXrvKnM/N70i8BlsvA2VIUq6XSkj4jU/NPEcOmpmPmED1KDwdpNrVwZ1Q+unuC+CtwZnC2d7erC5dgQYBK5/B6V78BZ7avmH1FotLSPGB+fMurLC1gXNKV8/9dFmofxKWSb+Zy2Hy/q+WaD5m1Rz
-repro2.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEWZiltp1s+Q5gKdy4vSE2KXaN/gwoD1XDFDopfevksVm1gwzaC5iQKXjYa7GQob6Hd3BU+N8JilHO8kGskPTbs=
-repro2.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINis4C+EmGmHSg39qHMvO08m8xE4Ydv9IIb58GOcA8CI
-
# reproducible.archlinux.org
reproducible.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC/kp2Rm2jhGQn0PJskhrmxUkYDDeEC8tXwvR+J+t40KACQnqi4SMdeu61Jyy2NBdBOw3muegb9kspOzN+NSQFpjYhfkYJGswyF46vTkgXUWJpuHBKiWkWmZzVKcveS6iAOEDLaeAesRHmcuEjaK323d0QDf6vJ4Gbb2veFoW5Kip37phrjZH2RCCLFdrw1IGopPuKHYDGwIIqt0hQLSkyq/A1BgmiR+eo4S8AlN7D/w0MVz7bKIuQkSmm5taTjo9FpOJJ0O6KMFXrXCPKPDuzSa/zMSQgNw+JnwhjQRbnH5AUB+xFe/qt8wstBGE/VT7WoyOsfTvfsgdQmz55BgPxR9lZI+rKl43Lp3zGojCaVOd+9wV08DgGN13W7imGqWuVq0vPyIkGl19Ch5mgemED49g2ehddeAUt0FR/MM8ewD1U4cHYpd4PHLgOdC9KfGvRJkymWFPd/EypwhEdFSCJ4BNDbQfYl4ciXnuTmbh3eM/Z/TjAmztQqAok08KAQYd8=
reproducible.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCs2GNtPdFkb9iiclsKjMvvTygCj1up0rKqhTYSC8GFFWgZtE1lsNjSEiFm9fQ0ihYciUfLWh9TlIsQpmVE33zg=
diff --git a/host_vars/jpn.mirror.pkgbuild.com b/host_vars/jpn.mirror.pkgbuild.com
deleted file mode 100644
index 12494af87..000000000
--- a/host_vars/jpn.mirror.pkgbuild.com
+++ /dev/null
@@ -1,8 +0,0 @@
----
-mirror_domain: jpn.mirror.pkgbuild.com
-archweb_mirrorcheck_locations: [8]
-arch32_mirror_domain: jpn.mirror.archlinux32.org
-network_interface: "eno2"
-ipv4_address: "161.202.225.107"
-ipv4_netmask: "/26"
-ipv4_gateway: "161.202.225.65"
diff --git a/hosts b/hosts
index 07b4aa0b4..248ad6c44 100644
--- a/hosts
+++ b/hosts
@@ -13,11 +13,9 @@ prio.ch-s012.rsync.net
u236610.your-storagebox.de
[pia]
-jpn.mirror.pkgbuild.com
ger.mirror.pkgbuild.com
runner1.archlinux.org
repro1.pkgbuild.com
-repro2.pkgbuild.com
[packet_net]
runner2.archlinux.org
@@ -25,12 +23,10 @@ repro3.pkgbuild.com
[mirrors]
ind.mirror.pkgbuild.com
-jpn.mirror.pkgbuild.com
ger.mirror.pkgbuild.com
[archive_mirrors]
ind.mirror.pkgbuild.com
-jpn.mirror.pkgbuild.com
ger.mirror.pkgbuild.com
[borg_clients]
@@ -93,7 +89,6 @@ secure-runner2.archlinux.org
[reproduciblebuilds]
repro1.pkgbuild.com
-repro2.pkgbuild.com
repro3.pkgbuild.com
[memcached]
diff --git a/roles/mirror_load_balancer/templates/nginx.d.conf.j2 b/roles/mirror_load_balancer/templates/nginx.d.conf.j2
index 9cbe1b00d..b66a486e1 100644
--- a/roles/mirror_load_balancer/templates/nginx.d.conf.j2
+++ b/roles/mirror_load_balancer/templates/nginx.d.conf.j2
@@ -5,9 +5,7 @@ geoip2 /var/lib/GeoIP/GeoLite2-City.mmdb {
map $geoip2_data_continent_name $preferred_upstream {
default ger.mirror.pkgbuild.com;
'Africa' ger.mirror.pkgbuild.com;
- 'Asia' jpn.mirror.pkgbuild.com;
'Europe' ger.mirror.pkgbuild.com;
- 'Oceania' jpn.mirror.pkgbuild.com;
}
log_format loadbalancer
--
GitLab