From 241847c7c78bf28f0112d7b68872a5285f86c438 Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Wed, 30 Apr 2025 22:29:13 +0200
Subject: [PATCH] Move to new house

---
 applyset-deploy.sh            |  6 +++---
 globals.nix                   |  4 ++--
 modules/bind9/default.nix     |  2 ++
 modules/bind9/kun.is.zone.nix | 10 ++++++----
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/applyset-deploy.sh b/applyset-deploy.sh
index 397cfbb..f7ec8e7 100644
--- a/applyset-deploy.sh
+++ b/applyset-deploy.sh
@@ -23,7 +23,7 @@ done
 
 first_server="${SERVERS%% *}"
 previous_manifest=$(
-	envsubst <<EOF | ssh -T "root@$first_server.dmz"
+	envsubst <<EOF | ssh -T "root@$first_server"
         if [[ -f "$GCROOTDIR/$NAME.yml" ]]; then
                 cat "$GCROOTDIR/$NAME.yml"
         fi
@@ -46,7 +46,7 @@ read -r -p "Continue? " _
 echo Uploading closure...
 for server in $SERVERS; do
 	echo Uploading closure to "$server"...
-	nix copy --to "ssh://root@$server.dmz" "$MANIFEST"
+	nix copy --to "ssh://root@$server" "$MANIFEST"
 done
 
 echo Applying Kubernetes manifest...
@@ -59,7 +59,7 @@ vals eval -fail-on-missing-key-in-map <"$MANIFEST" |
 
 echo Creating GC roots
 for server in $SERVERS; do
-	ssh "root@$server.dmz" "mkdir -p $GCROOTDIR && ln -sf $MANIFEST $GCROOTDIR/${NAME}.yml"
+	ssh "root@$server" "mkdir -p $GCROOTDIR && ln -sf $MANIFEST $GCROOTDIR/${NAME}.yml"
 done
 
 if $CREATE_LOCAL_GCROOT; then
diff --git a/globals.nix b/globals.nix
index 1ce4536..296b4f5 100644
--- a/globals.nix
+++ b/globals.nix
@@ -34,8 +34,8 @@ _: {
       };
     };
 
-    routerPublicIPv4 = "192.145.57.90";
-    routerPublicIPv6 = "2a0d:6e00:1a77::1";
+    routerPublicIPv4 = "89.220.7.89";
+    #routerPublicIPv6 = "2a0d:6e00:1a77::1";
     bind9Ipv6 = "2a0d:6e00:1a77:30::134";
 
     # Load balancer IPv4
diff --git a/modules/bind9/default.nix b/modules/bind9/default.nix
index 5cebe2a..68d4025 100644
--- a/modules/bind9/default.nix
+++ b/modules/bind9/default.nix
@@ -117,6 +117,7 @@ in {
         bind9-udp = {
           metadata.annotations = {
             "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}";
+            # "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4}";
             "metallb.universe.tf/allow-shared-ip" = "dns";
           };
 
@@ -137,6 +138,7 @@ in {
         bind9-tcp = {
           metadata.annotations = {
             "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4},${globals.bind9Ipv6}";
+            # "metallb.universe.tf/loadBalancerIPs" = "${globals.bind9IPv4}";
             "metallb.universe.tf/allow-shared-ip" = "dns";
           };
 
diff --git a/modules/bind9/kun.is.zone.nix b/modules/bind9/kun.is.zone.nix
index 3c12587..00999e8 100644
--- a/modules/bind9/kun.is.zone.nix
+++ b/modules/bind9/kun.is.zone.nix
@@ -5,7 +5,7 @@ with dns.lib.combinators; {
   SOA = {
     nameServer = "ns1";
     adminEmail = "webmaster.kun.is";
-    serial = 2024041301;
+    serial = 2024041302;
   };
 
   NS = [
@@ -24,13 +24,15 @@ with dns.lib.combinators; {
   subdomains = rec {
     "*".A = [globals.routerPublicIPv4];
 
-    ns = {
+    ns1 = {
       A = [globals.routerPublicIPv4];
       AAAA = [];
     };
 
-    ns1 = ns;
-    ns2 = ns;
+    ns2 = {
+      A = ["192.145.57.90"];
+      AAAA = [];
+    };
 
     wg = {
       A = [globals.routerPublicIPv4];