From 2340ca381d5ad6d1a57006bdfa0325b38ef485ba Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Thu, 5 Sep 2024 17:24:09 -0700
Subject: [PATCH] chore(tf): tailscale updates

---
 ci/systems.json              | 12 ++++++------
 docs/network.adoc            |  1 +
 nixos/tailscale.nix          |  2 +-
 systems/nue/default.nix      |  4 ++--
 systems/reisen/systems.json  |  8 ++++----
 systems/sakuya/default.nix   |  4 ++--
 systems/shanghai/default.nix |  4 ++--
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/ci/systems.json b/ci/systems.json
index 0e85d031..ce52f241 100644
--- a/ci/systems.json
+++ b/ci/systems.json
@@ -252,8 +252,8 @@
           "macAddress": null
         },
         "tail": {
-          "address4": "100.86.77.54",
-          "address6": "fd7a:115c:a1e0:ab12:4843:cd96:6256:4d36",
+          "address4": "100.75.15.95",
+          "address6": "fd7a:115c:a1e0::fa01:f5f",
           "macAddress": null
         }
       }
@@ -310,8 +310,8 @@
           "macAddress": "02:ba:46:f8:40:52"
         },
         "tail": {
-          "address4": "100.71.135.42",
-          "address6": "fd7a:115c:a1e0::4f01:872a",
+          "address4": "100.106.9.75",
+          "address6": "fd7a:115c:a1e0::f501:94b",
           "macAddress": null
         }
       }
@@ -328,8 +328,8 @@
           "macAddress": "18:c0:4d:08:87:bc"
         },
         "tail": {
-          "address4": "100.104.155.122",
-          "address6": "fd7a:115c:a1e0:ab12:4843:cd96:6268:9b7a",
+          "address4": "100.107.45.44",
+          "address6": "fd7a:115c:a1e0::4e01:2d2c",
           "macAddress": null
         }
       }
diff --git a/docs/network.adoc b/docs/network.adoc
index 7e7acfd1..080d1c8b 100644
--- a/docs/network.adoc
+++ b/docs/network.adoc
@@ -31,6 +31,7 @@ idp:: `10.1.1.46`
 aya:: `10.1.1.47`
 keycloak:: `10.1.1.48`
 kasen:: `10.1.1.49`
+sakuya:: `10.1.1.50`
 
 nue:: `10.1.1.62`
 logistics:: `10.1.1.63`
diff --git a/nixos/tailscale.nix b/nixos/tailscale.nix
index 4084ea18..53cfcdf1 100644
--- a/nixos/tailscale.nix
+++ b/nixos/tailscale.nix
@@ -88,7 +88,7 @@ in {
           fi
 
           # otherwise authenticate with tailscale
-          ${getExe tailscale} up ${advertiseExitNode} -authkey $(cat ${config.sops.secrets.tailscale-key.path})
+          ${getExe tailscale} up --accept-dns=false ${advertiseExitNode} -authkey $(cat ${config.sops.secrets.tailscale-key.path})
         '';
     };
   };
diff --git a/systems/nue/default.nix b/systems/nue/default.nix
index 6f944ca0..eb79b57a 100644
--- a/systems/nue/default.nix
+++ b/systems/nue/default.nix
@@ -16,8 +16,8 @@ in {
     };
     tail = {
       imports = [netname];
-      address4 = "100.86.77.54";
-      address6 = "fd7a:115c:a1e0:ab12:4843:cd96:6256:4d36";
+      address4 = "100.75.15.95";
+      address6 = "fd7a:115c:a1e0::fa01:f5f";
     };
   };
   exports.services = {
diff --git a/systems/reisen/systems.json b/systems/reisen/systems.json
index 2eae4d05..eefc81cb 100644
--- a/systems/reisen/systems.json
+++ b/systems/reisen/systems.json
@@ -15,7 +15,7 @@
         },
         "tail": {
           "address4": "100.109.213.94",
-          "address6": "fd7a:115c:a1e0::eaed:d55e",
+          "address6": "fd7a:115c:a1e0::ea01:d55f",
           "macAddress": null
         }
       }
@@ -69,7 +69,7 @@
         },
         "tail": {
           "address4": "100.71.65.59",
-          "address6": "fd7a:115c:a1e0::9187:413b",
+          "address6": "fd7a:115c:a1e0::9101:413b",
           "macAddress": null
         }
       }
@@ -163,7 +163,7 @@
         },
         "tail": {
           "address4": "100.113.253.48",
-          "address6": "fd7a:115c:a1e0::f1b1:fd30",
+          "address6": "fd7a:115c:a1e0::f101:fd31",
           "macAddress": null
         }
       }
@@ -185,7 +185,7 @@
         },
         "tail": {
           "address4": "100.74.104.29",
-          "address6": "fd7a:115c:a1e0::fd8a:681d",
+          "address6": "fd7a:115c:a1e0::fd01:681d",
           "macAddress": null
         }
       }
diff --git a/systems/sakuya/default.nix b/systems/sakuya/default.nix
index 92ff08f9..4b51c68c 100644
--- a/systems/sakuya/default.nix
+++ b/systems/sakuya/default.nix
@@ -10,8 +10,8 @@ _: {
   };
   network.networks = {
     tail = {
-      address4 = "100.71.135.42";
-      address6 = "fd7a:115c:a1e0::4f01:872a";
+      address4 = "100.106.9.75";
+      address6 = "fd7a:115c:a1e0::f501:94b";
     };
     local = {
       macAddress = "02:ba:46:f8:40:52";
diff --git a/systems/shanghai/default.nix b/systems/shanghai/default.nix
index 01ba6c39..689d6974 100644
--- a/systems/shanghai/default.nix
+++ b/systems/shanghai/default.nix
@@ -30,8 +30,8 @@ in {
     };
     tail = {
       imports = [netname];
-      address4 = "100.104.155.122";
-      address6 = "fd7a:115c:a1e0:ab12:4843:cd96:6268:9b7a";
+      address4 = "100.107.45.44";
+      address6 = "fd7a:115c:a1e0::4e01:2d2c";
     };
   };
   exports.services = {