From 782414f1ceb87778c7f10c4c602984d206aab21e Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 18 Sep 2023 20:32:52 +0900
Subject: [PATCH] Test

---
 nixos/hosts/nixos-rpi4-01/default.nix | 6 +++---
 nixos/hosts/nixos-rpi4-02/default.nix | 4 ++--
 nixos/hosts/nixos-rpi4-03/default.nix | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/hosts/nixos-rpi4-01/default.nix b/nixos/hosts/nixos-rpi4-01/default.nix
index e616ebaa..b4a46fe7 100644
--- a/nixos/hosts/nixos-rpi4-01/default.nix
+++ b/nixos/hosts/nixos-rpi4-01/default.nix
@@ -36,7 +36,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.nixos-rpi4-01_tailscale_key = {
+  sops.secrets.tailscale.nixos-rpi4-01 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [ 
@@ -44,10 +44,10 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/nixos-rpi4-01_tailscale_key";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale/nixos-rpi4-01";
   services.tailscale.extraUpFlags = [ "--advertise-exit-node" ];
   boot.kernel.sysctl = { "net.ipv4.ip_forward" = true; };
   
   # Temporary
-  # networking.firewall.allowedTCPPorts = [ 22 ];
+  networking.firewall.allowedTCPPorts = [ 22 ];
 }
\ No newline at end of file
diff --git a/nixos/hosts/nixos-rpi4-02/default.nix b/nixos/hosts/nixos-rpi4-02/default.nix
index 2ecd2162..d329835e 100644
--- a/nixos/hosts/nixos-rpi4-02/default.nix
+++ b/nixos/hosts/nixos-rpi4-02/default.nix
@@ -36,7 +36,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.nixos-rpi4-01_tailscale_key = {
+  sops.secrets.tailscale.nixos-rpi4-02 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [ 
@@ -44,7 +44,7 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/nixos-rpi4-02_tailscale_key";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale/nixos-rpi4-02";
   services.tailscale.extraUpFlags = [ "--advertise-exit-node" ];
   boot.kernel.sysctl = { "net.ipv4.ip_forward" = true; };
   
diff --git a/nixos/hosts/nixos-rpi4-03/default.nix b/nixos/hosts/nixos-rpi4-03/default.nix
index 1f23f149..335f96a0 100644
--- a/nixos/hosts/nixos-rpi4-03/default.nix
+++ b/nixos/hosts/nixos-rpi4-03/default.nix
@@ -36,7 +36,7 @@
 
   # Generic Tailscale configs are in /nixos/common/services/tailscale.nix  
   # Set up the secrets file:
-  sops.secrets.nixos-rpi4-01_tailscale_key = {
+  sops.secrets.tailscale.nixos-rpi4-03 = {
     owner = "root";
     sopsFile = ../../../secrets/tailscale.yaml;
     restartUnits = [ 
@@ -44,7 +44,7 @@
       "tailscaled-autoconnect.service" 
     ];
   };
-  services.tailscale.authKeyFile = "/run/secrets/nixos-rpi4-03_tailscale_key";
+  services.tailscale.authKeyFile = "/run/secrets/tailscale/nixos-rpi4-03";
   services.tailscale.extraUpFlags = [ "--advertise-exit-node" ];
   boot.kernel.sysctl = { "net.ipv4.ip_forward" = true; };