From b6675db5e63769dffa22f3b48a958a62c9e127a7 Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Sat, 9 Jul 2022 07:01:41 +0300
Subject: [PATCH] Add new mirrors in Seoul and Sydney
---
host_vars/seoul.mirror.pkgbuild.com/misc | 16 +++++++++++++++
.../vault_wireguard.yml | 9 +++++++++
host_vars/sydney.mirror.pkgbuild.com/misc | 16 +++++++++++++++
.../vault_wireguard.yml | 9 +++++++++
hosts | 6 ++++++
roles/prometheus/defaults/main.yml | 2 ++
tf-stage1/archlinux.tf | 8 ++++++++
tf-stage1/templates.tf | 20 +++++++++++++++++++
8 files changed, 86 insertions(+)
create mode 100644 host_vars/seoul.mirror.pkgbuild.com/misc
create mode 100644 host_vars/seoul.mirror.pkgbuild.com/vault_wireguard.yml
create mode 100644 host_vars/sydney.mirror.pkgbuild.com/misc
create mode 100644 host_vars/sydney.mirror.pkgbuild.com/vault_wireguard.yml
diff --git a/host_vars/seoul.mirror.pkgbuild.com/misc b/host_vars/seoul.mirror.pkgbuild.com/misc
new file mode 100644
index 000000000..368cecc93
--- /dev/null
+++ b/host_vars/seoul.mirror.pkgbuild.com/misc
@@ -0,0 +1,16 @@
+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
new file mode 100644
index 000000000..ee6b2856c
--- /dev/null
+++ b/host_vars/seoul.mirror.pkgbuild.com/vault_wireguard.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+38366136343935343739363337613934353037393630393130643066373565643336396132353763
+6564343166616561623037396332373336316330303333630a383564306235366333303065666236
+64363562376535353435643765623335356465376562333438303531663730623037343934343935
+6631316462303565370a613765316264376134313430346232613033353365333338343839623331
+66383266373866613363363431643664643061363164626264303366383037656331393666643831
+66343865323735313632333434663431666463396338353633646538626439616163333638633164
+37653237383230656432313433626235643561333931346134393061363262663934393463366634
+36613730313763343862
diff --git a/host_vars/sydney.mirror.pkgbuild.com/misc b/host_vars/sydney.mirror.pkgbuild.com/misc
new file mode 100644
index 000000000..6f73efaeb
--- /dev/null
+++ b/host_vars/sydney.mirror.pkgbuild.com/misc
@@ -0,0 +1,16 @@
+hostname: "sydney.mirror.pkgbuild.com"
+mirror_domain: "sydney.mirror.pkgbuild.com"
+ipv4_address: "147.75.48.159"
+ipv4_netmask: "/31"
+ipv6_address: "2604:1380:40f1:6a00::1"
+ipv6_netmask: "/127"
+ipv4_gateway: "147.75.48.158"
+ipv6_gateway: "2604:1380:40f1:6a00::"
+filesystem: "btrfs"
+network_interface: "enp2s0f0np0"
+system_disks:
+ - /dev/sda
+ - /dev/sdb
+configure_network: true
+wireguard_address: 10.0.0.39
+wireguard_public_key: nBu1/pofjzyD31D32VHIs8ajNc5thkzweOWsW28WSFU=
diff --git a/host_vars/sydney.mirror.pkgbuild.com/vault_wireguard.yml b/host_vars/sydney.mirror.pkgbuild.com/vault_wireguard.yml
new file mode 100644
index 000000000..bdc0e350b
--- /dev/null
+++ b/host_vars/sydney.mirror.pkgbuild.com/vault_wireguard.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+32336664393464623630396239636539616239343332623261386337376335386139346336393065
+6530316635653337653630303264666635313138303233640a313263343334646661363235313733
+64613539366566346438313266373439643239343731313565306163623836313162643336303737
+3736626632363963660a396435376137303038636163306134383966303035636232626163316362
+66636136633265336634353534396331393266393438356237326265343337336265323865663137
+33653332666535646632343236383364323961353461306463636261643832663765663338663663
+36383463376664666635636637323264303063383731353033623634303630323965666331646631
+34363766653866643665
diff --git a/hosts b/hosts
index 3eb7142dc..dec3215d3 100644
--- a/hosts
+++ b/hosts
@@ -6,17 +6,23 @@ build.archlinux.org
[packet_net]
runner2.archlinux.org
repro1.pkgbuild.com
+seoul.mirror.pkgbuild.com
+sydney.mirror.pkgbuild.com
[mirrors]
america.mirror.pkgbuild.com
asia.mirror.pkgbuild.com
europe.mirror.pkgbuild.com
mirror.pkgbuild.com
+seoul.mirror.pkgbuild.com
+sydney.mirror.pkgbuild.com
[geo_mirrors]
america.mirror.pkgbuild.com
#asia.mirror.pkgbuild.com
europe.mirror.pkgbuild.com
+seoul.mirror.pkgbuild.com
+sydney.mirror.pkgbuild.com
[archive_mirrors]
america.mirror.pkgbuild.com
diff --git a/roles/prometheus/defaults/main.yml b/roles/prometheus/defaults/main.yml
index baa99b371..f8ae923c6 100644
--- a/roles/prometheus/defaults/main.yml
+++ b/roles/prometheus/defaults/main.yml
@@ -62,8 +62,10 @@ blackbox_targets:
- https://repos.archlinux.org/lastupdate
- https://reproducible.archlinux.org
- 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
- https://terms.archlinux.org
- https://tu-bylaws.aur.archlinux.org
- https://whatcanidofor.archlinux.org
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index 584718999..261b736f3 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -356,6 +356,14 @@ locals {
ipv4_address = "89.187.191.12"
ipv6_address = "2a02:6ea0:c237::2"
}
+ "seoul.mirror" = {
+ ipv4_address = "145.40.87.75"
+ ipv6_address = "2604:1380:11:2600::1"
+ }
+ "sydney.mirror" = {
+ ipv4_address = "147.75.48.159"
+ ipv6_address = "2604:1380:40f1:6a00::1"
+ }
repro1 = {
ipv4_address = "147.75.81.79"
ipv6_address = "2604:1380:2001:4500::1"
diff --git a/tf-stage1/templates.tf b/tf-stage1/templates.tf
index cb269ad15..459f1561d 100644
--- a/tf-stage1/templates.tf
+++ b/tf-stage1/templates.tf
@@ -210,3 +210,23 @@ resource "hetznerdns_record" "geo_ns3" {
type = "NS"
ttl = lookup(local.geo_domains[each.key], "ttl", 86400)
}
+
+resource "hetznerdns_record" "geo_ns4" {
+ for_each = local.geo_domains
+
+ zone_id = each.value.zone_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
+
+ zone_id = each.value.zone_id
+ name = each.value.name
+ value = "sydney.mirror.pkgbuild.com."
+ type = "NS"
+ ttl = lookup(local.geo_domains[each.key], "ttl", 86400)
+}
--
GitLab