diff --git a/docs/geomirrors.md b/docs/geomirrors.md index 9b2968e5cf17b7ed535a94fa2c661c018be24297..703ebaf192f4872919015cf80ab73c5d8b8e4e02 100644 --- a/docs/geomirrors.md +++ b/docs/geomirrors.md @@ -9,7 +9,6 @@ DevOps team maintain a geo mirror across the world. The Geo mirror is public fac | https://sydney.mirror.pkgbuild.com/ | Australia | | https://europe.mirror.pkgbuild.com/ | Czechia | | https://asia.mirror.pkgbuild.com/ | Hong Kong | -| https://seoul.mirror.pkgbuild.com/ | South Korea | | https://london.mirror.pkgbuild.com/ | United Kingdom | | https://america.mirror.pkgbuild.com/ | United States | diff --git a/docs/ssh-hostkeys.txt b/docs/ssh-hostkeys.txt index 249e07c26fab9882ccf5a5bf1aa9d2c01ea67e3d..57cd52cc341808406b72c3034fa19c803c8f5d63 100644 --- a/docs/ssh-hostkeys.txt +++ b/docs/ssh-hostkeys.txt @@ -313,15 +313,6 @@ 256 MD5:9e:30:b4:b8:91:f0:e2:4c:ff:c5:54:9a:73:b0:17:76 root@archlinux-packer (ED25519) 3072 MD5:bf:05:ec:33:54:26:58:51:a8:20:a5:c2:35:55:f8:bd root@archlinux-packer (RSA) -# seoul.mirror.pkgbuild.com -256 SHA256:cqDfTJUWV4AYwlZvjD1OPhtVljLRq28G+pQ0Kxl5ea0 root@seoul.mirror.pkgbuild.com (ECDSA) -256 SHA256:PPGHFD1wBW2wR/W8dZqqdxX0fB9V5aYsCCAWGAn03aE root@seoul.mirror.pkgbuild.com (ED25519) -3072 SHA256:ZmHXCGucLCkY4o3r9S8iO1VJr0S8F+nvrPvGckSQS2A root@seoul.mirror.pkgbuild.com (RSA) - -256 MD5:a2:7f:57:45:1b:31:f2:92:5c:c5:63:8a:1b:ad:be:12 root@seoul.mirror.pkgbuild.com (ECDSA) -256 MD5:73:75:b6:93:c7:c2:00:e8:69:de:68:90:fe:85:12:b6 root@seoul.mirror.pkgbuild.com (ED25519) -3072 MD5:51:52:c1:ae:ff:91:11:8b:e7:47:4d:47:db:f0:69:59 root@seoul.mirror.pkgbuild.com (RSA) - # state.archlinux.org 256 SHA256:uR7EDdVrvkZf43eNmumOeu2MeZn4oMB39ad9kHoobkk root@archlinux-packer (ECDSA) 256 SHA256:Ydzb7NVfbhdfyNXoylx4qWsIS3dJ8oHS+8FDVsZBQPE root@archlinux-packer (ED25519) diff --git a/docs/ssh-known_hosts.txt b/docs/ssh-known_hosts.txt index 241cbf06f73528b5af3c239ad712bcfbeae90bf0..4f1c6e95f27790ba4db5f3a24dfcde473d18bb5e 100644 --- a/docs/ssh-known_hosts.txt +++ b/docs/ssh-known_hosts.txt @@ -185,11 +185,6 @@ security.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIb security.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqO7Y5B1+LN3D5dwj27kX+oCcJf1LPUCRZY45Xc6/58 security.archlinux.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxRzMwXBd76mKp0YdOBjMuS4rXSSHXuilBNqTqpHcaJdzBG6PX7YYes5AIaJkp/5eoXzH1RpvTKuSr5Wp+rk23gsDSdKlo1F7fNM2htv5I3UZn7b/zr4mPoV6UMtgmYt2dh1PU3YsIyAb35iA+mZHha6a5hXqdbhCzJKPsw5GuAg7Xafvz75W6XiRUW6CRhFtWVdaQfP3Lgs7HvQY9WFpkIBnnzCTs/ZaaR5E0/ayO20rcasrk0NiopGqc+2d5NL6p8P9zf/+2/BNo5fQThM5h4bqogvTbedbWxuO5vuzjY4r0CGTQrfQiLDpcfc311RcXiY8TYPODa8V6WJj67mNJ+/KfVy7croWciJiF5l2xDdujGESO7cIhLPggcvIKFZuEuxBL/I31C2NpTnpgc+K9DmnaBB8n3+C9ZK9RYP5dg1JgYUSXGdP1Y2ZXOx4OOGFssNQg542Bz25uMxg7hNj50bzwHfHlBPY1ECWH/peChzaBKz2xOMo4FnaHSQs855E= -# seoul.mirror.pkgbuild.com -seoul.mirror.pkgbuild.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFh48io3Re+4mfhin3uKVhBpbCkGPO/gCkALvnexh2DMYkyGqIU8j8TKZURAjakiogpPRk3njNWDebVR49Cm53I= -seoul.mirror.pkgbuild.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG2CcYGOATg32dRrjempcqiHfYVVHc5pktyRrTj3BMXO -seoul.mirror.pkgbuild.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDDA7v8iaGIHszPIQTbsOHX0gHE3IIArfpshIGzIz4n3mjraFY0yFhew2WY1lc3sBIvEdoM9FX/Ch4bdBYhjEbkWZ0OurskzACOthioF4y77IC7ZmQvZwY8OX9mXi2cozhHaP24vH7zD9XqpU1l6gPfedcD1JPXksNqpBPvMxkbCDPmUKzJ7MrcmrZeBnGErH9G9ZRmFvyg1lgZaVEVHoIAu4kDf/ip5Z8U/lMedTNoVKn39QltfPWKHAKj42/yruHMPmorkGW/AwEdRWKE1e5cynpqy3Lh7fFhvwriKOJVedKdi9L/urMo5wVKun5JpZ5wE4CAKj4A4ZNT0o7N8VNzKwnjoZ+BEKrSQfqM8AeRAhTZjKUmAVDNjsnGIRJtwJ1rguEgCjfZtuF8IAjCZ9Q1sSlOrh/2dJkQeFsuJ/inWOgkHtlV7t6FsFAH0pM4sYbZ/lUEd3He8ddz1yZF/lW/kQVY80asqjpwnIYPsxsoJgqltdh2KsCUOFA1WJSnM+c= - # state.archlinux.org state.archlinux.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB2HL4mX0ma/+jI39lCn0V8+5V+C2kz8BoWxJUME8VYFP8yQo93t0mYylUWRTfcK58RhFsfHfRuEflndeRlLqEk= state.archlinux.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFbZyVxaIdyd5f/dhPN7qGBnOSpLCYzoEqAKuakhi5ou diff --git a/host_vars/seoul.mirror.pkgbuild.com/misc b/host_vars/seoul.mirror.pkgbuild.com/misc deleted file mode 100644 index 368cecc93beeccca9412294ecdb4699bbf3c9f01..0000000000000000000000000000000000000000 --- a/host_vars/seoul.mirror.pkgbuild.com/misc +++ /dev/null @@ -1,16 +0,0 @@ -hostname: "seoul.mirror.pkgbuild.com" -mirror_domain: "seoul.mirror.pkgbuild.com" -ipv4_address: "145.40.87.75" -ipv4_netmask: "/31" -ipv6_address: "2604:1380:11:2600::1" -ipv6_netmask: "/127" -ipv4_gateway: "145.40.87.74" -ipv6_gateway: "2604:1380:11:2600::" -filesystem: "btrfs" -network_interface: "enp2s0f0np0" -system_disks: - - /dev/sda - - /dev/sdb -configure_network: true -wireguard_address: 10.0.0.38 -wireguard_public_key: McOwoiKss/6tIYkNGcaR7Jex36tSCD1CnztMFssy/Tk= diff --git a/host_vars/seoul.mirror.pkgbuild.com/vault_wireguard.yml b/host_vars/seoul.mirror.pkgbuild.com/vault_wireguard.yml deleted file mode 100644 index ee6b2856cc83ca76bc284b9b85c26810fbc39d2c..0000000000000000000000000000000000000000 --- a/host_vars/seoul.mirror.pkgbuild.com/vault_wireguard.yml +++ /dev/null @@ -1,9 +0,0 @@ -$ANSIBLE_VAULT;1.1;AES256 -38366136343935343739363337613934353037393630393130643066373565643336396132353763 -6564343166616561623037396332373336316330303333630a383564306235366333303065666236 -64363562376535353435643765623335356465376562333438303531663730623037343934343935 -6631316462303565370a613765316264376134313430346232613033353365333338343839623331 -66383266373866613363363431643664643061363164626264303366383037656331393666643831 -66343865323735313632333434663431666463396338353633646538626439616163333638633164 -37653237383230656432313433626235643561333931346134393061363262663934393463366634 -36613730313763343862 diff --git a/hosts b/hosts index c8b58a99e2211f3e45ee8a264c5fe164b1f743ce..14c86482e6a190cad10421f5ba8da8d5dcf7de88 100644 --- a/hosts +++ b/hosts @@ -9,7 +9,6 @@ repos.archlinux.org ansible_host=168.119.141.106 [equinix_metal] repro3.pkgbuild.com runner3.archlinux.org -seoul.mirror.pkgbuild.com sydney.mirror.pkgbuild.com [mirrors] @@ -18,7 +17,6 @@ asia.mirror.pkgbuild.com europe.mirror.pkgbuild.com london.mirror.pkgbuild.com mirror.pkgbuild.com -seoul.mirror.pkgbuild.com sydney.mirror.pkgbuild.com #TODO(gromit): remove ansible host once the DNS record is set repos.archlinux.org ansible_host=168.119.141.106 @@ -28,7 +26,6 @@ america.mirror.pkgbuild.com asia.mirror.pkgbuild.com europe.mirror.pkgbuild.com london.mirror.pkgbuild.com -seoul.mirror.pkgbuild.com sydney.mirror.pkgbuild.com [archive_mirrors] diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml index 30eebe01e6c5d2393f0b5ee746e484ea030841a4..c7dcddcaf96d09afaa1e9890c9eb338011eb1192 100644 --- a/roles/prometheus/defaults/main.yml +++ b/roles/prometheus/defaults/main.yml @@ -76,7 +76,6 @@ blackbox_targets: - https://reproducible.archlinux.org - https://rfc.archlinux.page - https://security.archlinux.org - - https://seoul.mirror.pkgbuild.com - https://sources.archlinux.org - https://static.conf.archlinux.org/README.md - https://sydney.mirror.pkgbuild.com diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf index 251c9f62b1bf44ed10d0d137d09a4a374ad89ef9..81868a7dab25ec01dfa020c42ae06701d141d9e3 100644 --- a/tf-stage1/archlinux.tf +++ b/tf-stage1/archlinux.tf @@ -389,11 +389,6 @@ locals { ipv6_address = "2001:ba8:0:4030::2" http3 = true } - "seoul.mirror" = { - ipv4_address = "145.40.87.75" - ipv6_address = "2604:1380:11:2600::1" - http3 = true - } "sydney.mirror" = { ipv4_address = "147.75.48.159" ipv6_address = "2604:1380:40f1:6a00::1" diff --git a/tf-stage1/templates.tf b/tf-stage1/templates.tf index 804abc17fe57256b9f457162fb9581f3a778aa3d..7e588ebf42899b38cf5dbd79e9f798754bfc1430 100644 --- a/tf-stage1/templates.tf +++ b/tf-stage1/templates.tf @@ -290,16 +290,6 @@ resource "hetznerdns_record" "geo_ns3" { ttl = lookup(local.geo_domains[each.key], "ttl", 86400) } -resource "hetznerdns_record" "geo_ns4" { - for_each = local.geo_domains - - zone_id = lookup(each.value, "zone", hetznerdns_zone.archlinux.id) - name = each.value.name - value = "seoul.mirror.pkgbuild.com." - type = "NS" - ttl = lookup(local.geo_domains[each.key], "ttl", 86400) -} - resource "hetznerdns_record" "geo_ns5" { for_each = local.geo_domains