fix(os::net:tailscale): enable conditionally to prevent lockouts

montchr · Jul 9, 2024 · ffd3de2 · ffd3de2
1 parent 375ad0d
commit ffd3de2
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/machines/boschic/default.nix b/machines/boschic/default.nix
@@ -28,6 +28,8 @@ in
 
   ### === networking ===========================================================
 
+  services.tailscale.enable = true;
+
   # FIXME: no connection on boot -- i need to disable internet and re-enable
   # every time despite indication of a wired connection in GNOME status bar
   networking =

diff --git a/machines/chert/networking.nix b/machines/chert/networking.nix
@@ -3,5 +3,7 @@ let
   inherit (config.networking) hostName;
 in
 {
+  services.tailscale.enable = true;
+
   networking.domain = ops.hosts.${hostName}.domain;
 }
diff --git a/machines/gabbro/networking.nix b/machines/gabbro/networking.nix
@@ -3,5 +3,7 @@ let
   inherit (config.networking) hostName;
 in
 {
+  services.tailscale.enable = true;
+
   networking.domain = ops.hosts.${hostName}.domain;
 }
diff --git a/machines/hierophant/networking.nix b/machines/hierophant/networking.nix
@@ -7,5 +7,6 @@ in
   networking.nameservers = dns.nameservers.cloudflare;
 
   # Allow this host to function as a Tailscale exit node.
+  services.tailscale.enable = true;
   services.tailscale.useRoutingFeatures = "both";
 }
diff --git a/machines/hodgepodge/default.nix b/machines/hodgepodge/default.nix
@@ -28,6 +28,8 @@
     };
   };
 
+  services.tailscale.enable = true;
+
   networking.usePredictableInterfaceNames = false;
   networking.firewall.enable = true;
 

diff --git a/machines/ryosuke/default.nix b/machines/ryosuke/default.nix
@@ -26,5 +26,7 @@
   time.timeZone = "America/New_York";
   networking.firewall.enable = true;
 
+  services.tailscale.enable = true;
+
   system.stateVersion = "22.05";
 }
diff --git a/nixos/profiles/networking/tailscale.nix b/nixos/profiles/networking/tailscale.nix
@@ -1,11 +1,5 @@
-{
-  lib,
-  config,
-  # pkgs,
-  ...
-}:
-{
-  services.tailscale.enable = true;
+{ lib, config, ... }:
+lib.mkIf config.services.tailscale.enable {
   services.tailscale.interfaceName = "ts0";
   services.tailscale.useRoutingFeatures = "client";
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,8 @@ @@
         };
       };
+      services.tailscale.enable = true;
       networking.usePredictableInterfaceNames = false;
       networking.firewall.enable = true;
@@ Expand Down @@