From 7b7f1de0bd9dd387d35e99c675caa26de4d20ff5 Mon Sep 17 00:00:00 2001
From: Daniel Micay <daniel.micay@grapheneos.org>
Date: Sun, 16 Nov 2025 00:20:17 -0500
Subject: [PATCH] drop zerotier-one from ns1.staging.grapheneos.org

We aren't currently using this for testing and it's going to be phased
out for the ns1 servers as soon as we get a second IPv4 /24.

This also switches over to using the nftables ruleset for ns2 instead of
ns1 since it doesn't need the zerotier nftables configuration anymore.
---
 hosts.sh                            | 2 +-
 packages/ns1.staging.grapheneos.org | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/hosts.sh b/hosts.sh
index 8322710..d34bbc4 100644
--- a/hosts.sh
+++ b/hosts.sh
@@ -76,7 +76,7 @@ declare -Ar hosts_authorized_keys=(
 )
 
 declare -Ar hosts_firewall=(
-    [ns1.staging.grapheneos.org]=ns1
+    [ns1.staging.grapheneos.org]=ns2
     [fra.ns1.grapheneos.org]=ns1
     [lax.ns1.grapheneos.org]=ns1
     [lon.ns1.grapheneos.org]=ns1
diff --git a/packages/ns1.staging.grapheneos.org b/packages/ns1.staging.grapheneos.org
index 64f921d..c2fcc0e 100644
--- a/packages/ns1.staging.grapheneos.org
+++ b/packages/ns1.staging.grapheneos.org
@@ -41,4 +41,3 @@ tree
 unbound
 xfsprogs
 yaml-cpp
-zerotier-one