From c844ccc4e3530e09b7d990dcec59806e354904ac Mon Sep 17 00:00:00 2001
From: beatzaplenty <wayne.bennett@live.com>
Date: Sat, 25 Jul 2026 16:33:03 +1000
Subject: [PATCH] =?UTF-8?q?fix(tailscale):=20rename=20tailscale-subnet-rou?=
 =?UTF-8?q?ter=20=E2=86=92=20tailscale-router=20everywhere?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Complete the rename so all identifiers match networking.hostName:
- flake.nix: attribute names and buildType strings
  (linode/proxmox/lxc-tailscale-subnet-router → *-tailscale-router)
- modules/build-types/tailscale-subnet-router.nix → tailscale-router.nix
- .sops.yaml: anchor and alias names (age keys unchanged, no re-encrypt needed)
- host-keys/: local gitignored key files renamed (not committed)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .sops.yaml                                           | 12 ++++++------
 flake.nix                                            |  6 +++---
 ...lscale-subnet-router.nix => tailscale-router.nix} |  0
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename modules/build-types/{tailscale-subnet-router.nix => tailscale-router.nix} (100%)

diff --git a/.sops.yaml b/.sops.yaml
index 431c81d..92d1f8e 100644
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -12,20 +12,20 @@ keys:
   - &linode-minimal age1e7l8dusgmgfzd2cxrrzwepzjxt69hzqj4epee0cs27u6yg4kxcuqm34ncx
   - &linode-nix-cache age1jcx3yajjhghn8qh8za3yeu8nxykzlg3p4nrv03vnfvzl0mzayg2qmg940e
   - &linode-server age1sweerhrga9yf8x6sv0apz4ed4g48rnlcq34rpv20t0rcelwgpgeqwvndzz
-  - &linode-tailscale-subnet-router age1f7usptjx9rv4rxauasve200gxtdt9jkqhhdqstlf20wvlm7u75rsjfw50m
+  - &linode-tailscale-router age1f7usptjx9rv4rxauasve200gxtdt9jkqhhdqstlf20wvlm7u75rsjfw50m
   - &lxc-docker age17jqc66x9yeshfgd9v78mj483r4zzarqdtuxtrkxe4x5mw679gphshd94th
   - &lxc-minimal age1px0h5l9zp2dww0m8fncrc82kfdmzplsfv2ltat7sna28xpg09pqqcl3s2k
   - &lxc-nix-cache age1ufg390ydrmma849t9xfkxxl5xvdkk6mngnlzhmy7mvuaje8sgcmsmnq6l7
   - &lxc-pxe-boot age16j42pdc5dr6wnj7xayhkqdj2rny9u68fcqejs50hqq42scssh4gsnrrnlt
   - &lxc-server age1nruncs4l0ufk7yuc4des8p99c0alfndl0lhsws8tycl5pplfp56s30af5f
-  - &lxc-tailscale-subnet-router age1k7d2du5mejsmv5rzavm4xwgpthqvcfsehduquv28nzs53zppa3kqngfxq2
+  - &lxc-tailscale-router age1k7d2du5mejsmv5rzavm4xwgpthqvcfsehduquv28nzs53zppa3kqngfxq2
   - &lxc-tor-relay age16kqfmvz4e23hmdlqresnyw69ej604s320mmd49h4hm3fhqchtgyqrws0k2
   - &proxmox-docker age1arhf2q45zw6wf2uevju4savp575x3m2tfvved5zzq3ay92ynua9s3cm92c
   - &proxmox-gui age19mn8zrxl8zpps9yvrh4euquvygpp4fp8queg7xc6qhtnl4ng8c9qx02qwn
   - &proxmox-nix-cache age1jlltcv5jcnm40z5k0q6hv053k2rqpqvemtuecdwn527uw8uqz4es3x7m68
   - &proxmox-pxe-boot age1ug787sgt6st6k82fgkrug2lzltw4qsukrrqqs3w27ewwqj8rg4hsxcmylz
   - &proxmox-server age1529taqdwr6t0w7cvzmty0d5y5593wffl0krt48j6uc4u39k56g2qf6ywtp
-  - &proxmox-tailscale-subnet-router age1zhfyuzlq40reuqlr34gf77852nhs3t6mqfzrqmas8z6sxk7tcfhsungrm0
+  - &proxmox-tailscale-router age1zhfyuzlq40reuqlr34gf77852nhs3t6mqfzrqmas8z6sxk7tcfhsungrm0
 
 creation_rules:
   # Shared across every currently-deployed host: root/nixos password hash,
@@ -48,20 +48,20 @@ creation_rules:
           - *linode-minimal
           - *linode-nix-cache
           - *linode-server
-          - *linode-tailscale-subnet-router
+          - *linode-tailscale-router
           - *lxc-docker
           - *lxc-minimal
           - *lxc-nix-cache
           - *lxc-pxe-boot
           - *lxc-server
-          - *lxc-tailscale-subnet-router
+          - *lxc-tailscale-router
           - *lxc-tor-relay
           - *proxmox-docker
           - *proxmox-gui
           - *proxmox-nix-cache
           - *proxmox-pxe-boot
           - *proxmox-server
-          - *proxmox-tailscale-subnet-router
+          - *proxmox-tailscale-router
 
   - path_regex: secrets/nix-cache\.yaml$
     key_groups:
diff --git a/flake.nix b/flake.nix
index 5a03e51..67a0d35 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,9 +96,9 @@
         proxmox-pxe-boot = mkTarget { platform = "proxmox"; buildType = "pxe-boot"; hostPath = ./hosts/pxe-boot/host.nix; };
         lxc-pxe-boot = mkTarget { platform = "lxc"; buildType = "pxe-boot"; hostPath = ./hosts/pxe-boot/host.nix; };
 
-        linode-tailscale-subnet-router = mkTarget { platform = "linode"; buildType = "tailscale-subnet-router"; hostPath = ./hosts/tailscale-router/host.nix; };
-        proxmox-tailscale-subnet-router = mkTarget { platform = "proxmox"; buildType = "tailscale-subnet-router"; hostPath = ./hosts/tailscale-router/host.nix; };
-        lxc-tailscale-subnet-router = mkTarget { platform = "lxc"; buildType = "tailscale-subnet-router"; hostPath = ./hosts/tailscale-router/host.nix; };
+        linode-tailscale-router = mkTarget { platform = "linode"; buildType = "tailscale-router"; hostPath = ./hosts/tailscale-router/host.nix; };
+        proxmox-tailscale-router = mkTarget { platform = "proxmox"; buildType = "tailscale-router"; hostPath = ./hosts/tailscale-router/host.nix; };
+        lxc-tailscale-router = mkTarget { platform = "lxc"; buildType = "tailscale-router"; hostPath = ./hosts/tailscale-router/host.nix; };
 
         lxc-tor-relay = mkTarget { platform = "lxc"; buildType = "tor-relay"; hostPath = ./hosts/tor-relay/host.nix; };
       };
diff --git a/modules/build-types/tailscale-subnet-router.nix b/modules/build-types/tailscale-router.nix
similarity index 100%
rename from modules/build-types/tailscale-subnet-router.nix
rename to modules/build-types/tailscale-router.nix