From b892c0e8f1cc982fb08cbc73d7419a14fb2dd804 Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@archlinux.org>
Date: Sat, 17 Jun 2023 21:09:33 +0100
Subject: [PATCH] geomirror: new uk based mirror sponsored from jump.net.uk
Initial setup bootstrapped from arch-boxes repo [1], default user 'arch'
removed after.
https://gitlab.archlinux.org/archlinux/arch-boxes/-/jobs/157024/artifacts/browse/output
Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
---
host_vars/london.mirror.pkgbuild.com/misc | 17 +++++++++++++++++
.../vault_wireguard.yml | 9 +++++++++
hosts | 2 ++
tf-stage1/archlinux.tf | 4 ++++
tf-stage1/templates.tf | 10 ++++++++++
5 files changed, 42 insertions(+)
create mode 100644 host_vars/london.mirror.pkgbuild.com/misc
create mode 100644 host_vars/london.mirror.pkgbuild.com/vault_wireguard.yml
diff --git a/host_vars/london.mirror.pkgbuild.com/misc b/host_vars/london.mirror.pkgbuild.com/misc
new file mode 100644
index 000000000..fade8a9a1
--- /dev/null
+++ b/host_vars/london.mirror.pkgbuild.com/misc
@@ -0,0 +1,17 @@
+hostname: "london.mirror.pkgbuild.com"
+mirror_domain: "london.mirror.pkgbuild.com"
+archweb_mirrorcheck_locations: [22, 23]
+ipv4_address: "185.73.44.89"
+ipv4_netmask: "/22"
+ipv4_gateway: "185.73.44.1"
+ipv6_address: "2001:ba8:0:4030::2"
+ipv6_netmask: "/64"
+ipv6_gateway: "fe80::fcff:ffff:feff:ffff"
+filesystem: "btrfs"
+network_interface: "enX0"
+system_disks:
+ - /dev/xvda1
+extra_disks:
+ - /dev/xvdb
+wireguard_address: 10.0.0.43
+wireguard_public_key: FuhMj8Vrk0HUR10O2dmgeXtw+bMAuhNesYD+h0lKgSc=
diff --git a/host_vars/london.mirror.pkgbuild.com/vault_wireguard.yml b/host_vars/london.mirror.pkgbuild.com/vault_wireguard.yml
new file mode 100644
index 000000000..840b56545
--- /dev/null
+++ b/host_vars/london.mirror.pkgbuild.com/vault_wireguard.yml
@@ -0,0 +1,9 @@
+$ANSIBLE_VAULT;1.1;AES256
+30663137336130633937383231343062333664636631323739373164663563363565383435633362
+6331356532616630373432373031383139613633646461330a373936663337326633656464353862
+36326239373864383662343737313436653639383562303433363634323562653637373236653736
+3765663532643338650a626433353131353730623864646535646138333236316563353032616235
+38653765306433656539383533653930376564663361356134303539316335636435616130383234
+63346238323761343635326263396362656663363237336232663039346465656265616366373433
+36353862386661366563366535383439333531656564366238323032656232633462336166343766
+37613432323131623461
diff --git a/hosts b/hosts
index 39252b8d9..4d1dadf90 100644
--- a/hosts
+++ b/hosts
@@ -14,6 +14,7 @@ sydney.mirror.pkgbuild.com
america.mirror.pkgbuild.com
asia.mirror.pkgbuild.com
europe.mirror.pkgbuild.com
+london.mirror.pkgbuild.com
mirror.pkgbuild.com
seoul.mirror.pkgbuild.com
sydney.mirror.pkgbuild.com
@@ -22,6 +23,7 @@ sydney.mirror.pkgbuild.com
america.mirror.pkgbuild.com
asia.mirror.pkgbuild.com
europe.mirror.pkgbuild.com
+london.mirror.pkgbuild.com
seoul.mirror.pkgbuild.com
sydney.mirror.pkgbuild.com
diff --git a/tf-stage1/archlinux.tf b/tf-stage1/archlinux.tf
index bf9d231cd..0a76d35c7 100644
--- a/tf-stage1/archlinux.tf
+++ b/tf-stage1/archlinux.tf
@@ -353,6 +353,10 @@ locals {
ipv4_address = "89.187.191.12"
ipv6_address = "2a02:6ea0:c237::2"
}
+ "london.mirror" = {
+ ipv4_address = "185.73.44.89"
+ ipv6_address = "2001:ba8:0:4030::2"
+ }
"seoul.mirror" = {
ipv4_address = "145.40.87.75"
ipv6_address = "2604:1380:11:2600::1"
diff --git a/tf-stage1/templates.tf b/tf-stage1/templates.tf
index c5997da10..0a6f8ac08 100644
--- a/tf-stage1/templates.tf
+++ b/tf-stage1/templates.tf
@@ -270,3 +270,13 @@ resource "hetznerdns_record" "geo_ns5" {
type = "NS"
ttl = lookup(local.geo_domains[each.key], "ttl", 86400)
}
+
+resource "hetznerdns_record" "geo_ns6" {
+ for_each = local.geo_domains
+
+ zone_id = lookup(each.value, "zone", hetznerdns_zone.archlinux.id)
+ name = each.value.name
+ value = "london.mirror.pkgbuild.com."
+ type = "NS"
+ ttl = lookup(local.geo_domains[each.key], "ttl", 86400)
+}
--
GitLab