From d682b05846f6474a6f9747c5c2adfa8cd44a19e4 Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Tue, 11 Nov 2025 04:25:00 -0500 Subject: [PATCH] replace remaining OVH ns1 servers with Vultr --- etc/systemd/network/2.ns1.grapheneos.org.link | 5 --- .../network/2.ns1.grapheneos.org.network | 26 ---------------- etc/systemd/network/3.ns1.grapheneos.org.link | 5 --- .../network/3.ns1.grapheneos.org.network | 26 ---------------- .../network/fra.ns1.grapheneos.org.link | 5 +++ .../network/fra.ns1.grapheneos.org.network | 9 ++++++ .../network/sin.ns1.grapheneos.org.link | 5 +++ .../network/sin.ns1.grapheneos.org.network | 9 ++++++ hosts.sh | 31 +++++++++---------- ....grapheneos.org => fra.ns1.grapheneos.org} | 0 ....grapheneos.org => sin.ns1.grapheneos.org} | 0 11 files changed, 43 insertions(+), 78 deletions(-) delete mode 100644 etc/systemd/network/2.ns1.grapheneos.org.link delete mode 100644 etc/systemd/network/2.ns1.grapheneos.org.network delete mode 100644 etc/systemd/network/3.ns1.grapheneos.org.link delete mode 100644 etc/systemd/network/3.ns1.grapheneos.org.network create mode 100644 etc/systemd/network/fra.ns1.grapheneos.org.link create mode 100644 etc/systemd/network/fra.ns1.grapheneos.org.network create mode 100644 etc/systemd/network/sin.ns1.grapheneos.org.link create mode 100644 etc/systemd/network/sin.ns1.grapheneos.org.network rename packages/{2.ns1.grapheneos.org => fra.ns1.grapheneos.org} (100%) rename packages/{3.ns1.grapheneos.org => sin.ns1.grapheneos.org} (100%) diff --git a/etc/systemd/network/2.ns1.grapheneos.org.link b/etc/systemd/network/2.ns1.grapheneos.org.link deleted file mode 100644 index 94f081d..0000000 --- a/etc/systemd/network/2.ns1.grapheneos.org.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -MACAddress=fa:16:3e:96:60:9c - -[Link] -Name=public diff --git a/etc/systemd/network/2.ns1.grapheneos.org.network b/etc/systemd/network/2.ns1.grapheneos.org.network deleted file mode 100644 index 1ad2f5b..0000000 --- a/etc/systemd/network/2.ns1.grapheneos.org.network +++ /dev/null @@ -1,26 +0,0 @@ -[Match] -Name=public - -[Network] -DHCP=ipv4 -LinkLocalAddressing=no -Address=2001:41d0:701:1100::245b/128 - -[Route] -Destination=::/0 -Gateway=2001:41d0:701:1100::1 -PreferredSource=2001:41d0:701:1100::245b - -[Route] -Destination=2001:41d0:701:1100::1 -PreferredSource=2001:41d0:701:1100::245b - -[DHCP] -UseMTU=true - -[CAKE] -Handle=1 -Bandwidth=500M -PriorityQueueingPreset=diffserv4 -FlowIsolationMode=dual-dst-host -SplitGSO=false diff --git a/etc/systemd/network/3.ns1.grapheneos.org.link b/etc/systemd/network/3.ns1.grapheneos.org.link deleted file mode 100644 index 67b4f6f..0000000 --- a/etc/systemd/network/3.ns1.grapheneos.org.link +++ /dev/null @@ -1,5 +0,0 @@ -[Match] -MACAddress=fa:16:3e:f7:ba:47 - -[Link] -Name=public diff --git a/etc/systemd/network/3.ns1.grapheneos.org.network b/etc/systemd/network/3.ns1.grapheneos.org.network deleted file mode 100644 index 89104ca..0000000 --- a/etc/systemd/network/3.ns1.grapheneos.org.network +++ /dev/null @@ -1,26 +0,0 @@ -[Match] -Name=public - -[Network] -DHCP=ipv4 -LinkLocalAddressing=no -Address=2402:1f00:8000:800::3966/128 - -[Route] -Destination=::/0 -Gateway=2402:1f00:8000:800::1 -PreferredSource=2402:1f00:8000:800::3966 - -[Route] -Destination=2402:1f00:8000:800::1 -PreferredSource=2402:1f00:8000:800::3966 - -[DHCP] -UseMTU=true - -[CAKE] -Handle=1 -Bandwidth=500M -PriorityQueueingPreset=diffserv4 -FlowIsolationMode=dual-dst-host -SplitGSO=false diff --git a/etc/systemd/network/fra.ns1.grapheneos.org.link b/etc/systemd/network/fra.ns1.grapheneos.org.link new file mode 100644 index 0000000..a2bb6ec --- /dev/null +++ b/etc/systemd/network/fra.ns1.grapheneos.org.link @@ -0,0 +1,5 @@ +[Match] +MACAddress=56:00:05:c2:23:a1 + +[Link] +Name=public diff --git a/etc/systemd/network/fra.ns1.grapheneos.org.network b/etc/systemd/network/fra.ns1.grapheneos.org.network new file mode 100644 index 0000000..2ad438c --- /dev/null +++ b/etc/systemd/network/fra.ns1.grapheneos.org.network @@ -0,0 +1,9 @@ +[Match] +Name=public + +[Network] +DHCP=ipv4 +Address=2602:f4d9::1/128 + +[DHCP] +UseMTU=true diff --git a/etc/systemd/network/sin.ns1.grapheneos.org.link b/etc/systemd/network/sin.ns1.grapheneos.org.link new file mode 100644 index 0000000..f5068a8 --- /dev/null +++ b/etc/systemd/network/sin.ns1.grapheneos.org.link @@ -0,0 +1,5 @@ +[Match] +MACAddress=56:00:05:c2:23:b0 + +[Link] +Name=public diff --git a/etc/systemd/network/sin.ns1.grapheneos.org.network b/etc/systemd/network/sin.ns1.grapheneos.org.network new file mode 100644 index 0000000..2ad438c --- /dev/null +++ b/etc/systemd/network/sin.ns1.grapheneos.org.network @@ -0,0 +1,9 @@ +[Match] +Name=public + +[Network] +DHCP=ipv4 +Address=2602:f4d9::1/128 + +[DHCP] +UseMTU=true diff --git a/hosts.sh b/hosts.sh index bb14fe5..c7ccba0 100644 --- a/hosts.sh +++ b/hosts.sh @@ -1,11 +1,11 @@ declare -Ar hosts_hostname=( [ns1.staging.grapheneos.org]=ns1-staging - [2.ns1.grapheneos.org]=2-ns1 - [3.ns1.grapheneos.org]=3-ns1 + [fra.ns1.grapheneos.org]=ns1-fra [lax.ns1.grapheneos.org]=ns1-lax [mia.ns1.grapheneos.org]=ns1-mia [nyc.ns1.grapheneos.org]=ns1-nyc [sea.ns1.grapheneos.org]=ns1-sea + [sin.ns1.grapheneos.org]=ns1-sin [brn.ns2.grapheneos.org]=ns2-brn [las.ns2.grapheneos.org]=ns2-las [nyc.ns2.grapheneos.org]=ns2-nyc @@ -52,11 +52,11 @@ declare -Ar hosts_hardware_watchdog=( ) declare -Ar hosts_authorized_keys=( - [2.ns1.grapheneos.org]=authorized_keys-replica-ns1 - [3.ns1.grapheneos.org]=authorized_keys-replica-ns1 + [fra.ns1.grapheneos.org]=authorized_keys-replica-ns1 [lax.ns1.grapheneos.org]=authorized_keys-replica-ns1 [mia.ns1.grapheneos.org]=authorized_keys-replica-ns1 [sea.ns1.grapheneos.org]=authorized_keys-replica-ns1 + [sin.ns1.grapheneos.org]=authorized_keys-replica-ns1 [brn.ns2.grapheneos.org]=authorized_keys-replica-ns2 [las.ns2.grapheneos.org]=authorized_keys-replica-ns2 [bhs1.grapheneos.org]=authorized_keys-replica-grapheneos @@ -73,12 +73,12 @@ declare -Ar hosts_authorized_keys=( declare -Ar hosts_firewall=( [ns1.staging.grapheneos.org]=ns1 - [2.ns1.grapheneos.org]=ns1 - [3.ns1.grapheneos.org]=ns1 + [fra.ns1.grapheneos.org]=ns1 [lax.ns1.grapheneos.org]=ns1 [mia.ns1.grapheneos.org]=ns1 [nyc.ns1.grapheneos.org]=ns1 [sea.ns1.grapheneos.org]=ns1 + [sin.ns1.grapheneos.org]=ns1 [brn.ns2.grapheneos.org]=ns2 [las.ns2.grapheneos.org]=ns2 [nyc.ns2.grapheneos.org]=ns2 @@ -152,12 +152,12 @@ declare -Ar hosts_tcp_fastopen=( declare -Ar hosts_conntrack_size=( [ns1.staging.grapheneos.org]=65536 - [2.ns1.grapheneos.org]=131072 - [3.ns1.grapheneos.org]=131072 + [fra.ns1.grapheneos.org]=65536 [lax.ns1.grapheneos.org]=65536 [mia.ns1.grapheneos.org]=65536 [nyc.ns1.grapheneos.org]=65536 [sea.ns1.grapheneos.org]=65536 + [sin.ns1.grapheneos.org]=65536 [brn.ns2.grapheneos.org]=65536 [las.ns2.grapheneos.org]=65536 [nyc.ns2.grapheneos.org]=65536 @@ -211,12 +211,12 @@ declare -Ar hosts_journald_system_max_file_size=( declare -Ar hosts_ipv4_address=( [ns1.staging.grapheneos.org]=198.98.56.238 - [2.ns1.grapheneos.org]=57.129.65.223 - [3.ns1.grapheneos.org]=15.235.197.61 + [fra.ns1.grapheneos.org]=80.240.20.200 [lax.ns1.grapheneos.org]=140.82.23.46 [mia.ns1.grapheneos.org]=45.32.173.220 [nyc.ns1.grapheneos.org]=66.135.8.22 [sea.ns1.grapheneos.org]=66.42.74.68 + [sin.ns1.grapheneos.org]=139.180.154.140 [brn.ns2.grapheneos.org]=107.189.3.168 [las.ns2.grapheneos.org]=205.185.124.155 [nyc.ns2.grapheneos.org]=198.98.53.141 @@ -242,12 +242,12 @@ declare -Ar hosts_ipv4_address=( declare -Ar hosts_ipv6_address=( [ns1.staging.grapheneos.org]=2605:6400:10:c41:de92:c534:326a:711a - [2.ns1.grapheneos.org]=2001:41d0:701:1100::245b - [3.ns1.grapheneos.org]=2402:1f00:8000:800::3966 + [fra.ns1.grapheneos.org]=2a05:f480:1800:2acd:5400:05ff:fec2:23a1 [lax.ns1.grapheneos.org]=2001:19f0:6000:2dcd:5400:05ff:fec1:97db [mia.ns1.grapheneos.org]=2001:19f0:9002:2981:5400:05ff:fec1:65c4 [nyc.ns1.grapheneos.org]=2001:19f0:1000:c0d4:5400:05ff:fec1:7c21 [sea.ns1.grapheneos.org]=2001:19f0:8001:0438:5400:05ff:fec1:9dbd + [sin.ns1.grapheneos.org]=2401:c080:1400:4890:5400:05ff:fec2:23b0 [brn.ns2.grapheneos.org]=2605:6400:30:ec25:102c:af6d:5be:1eb8 [las.ns2.grapheneos.org]=2605:6400:20:1c8f:a0c9:372d:482e:945b [nyc.ns2.grapheneos.org]=2605:6400:10:102e:95bc:89ef:2e7f:49bb @@ -271,7 +271,7 @@ declare -Ar hosts_ipv6_address=( ) readonly hosts_ns1=( - {{2..3},lax,mia,nyc,sea}.ns1.grapheneos.org + {fra,lax,mia,nyc,sea,sin}.ns1.grapheneos.org ) readonly hosts_ns2=( @@ -313,7 +313,7 @@ readonly hosts_primary=( ) readonly hosts_secondary=( - {{2..3},lax,mia,sea}.ns1.grapheneos.org + {fra,lax,mia,sea,sin}.ns1.grapheneos.org {brn,las}.ns2.grapheneos.org {bhs1,gra0,gra1,las0,las1,sin0,sin1}.grapheneos.org {lax,lon}.releases.grapheneos.org @@ -362,7 +362,7 @@ readonly hosts_all=( ) readonly hosts_vultr=( - {lax,mia,nyc,sea}.ns1.grapheneos.org + {fra,lax,mia,nyc,sea,sin}.ns1.grapheneos.org ) readonly hosts_buyvm=( @@ -374,7 +374,6 @@ readonly hosts_buyvm=( ) readonly hosts_ovh=( - {2..3}.ns1.grapheneos.org mail.grapheneos.org {bhs0,bhs1,gra0,gra1,sin0,sin1}.grapheneos.org attestation.app diff --git a/packages/2.ns1.grapheneos.org b/packages/fra.ns1.grapheneos.org similarity index 100% rename from packages/2.ns1.grapheneos.org rename to packages/fra.ns1.grapheneos.org diff --git a/packages/3.ns1.grapheneos.org b/packages/sin.ns1.grapheneos.org similarity index 100% rename from packages/3.ns1.grapheneos.org rename to packages/sin.ns1.grapheneos.org