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

montchr · montchr · commit ffd3de24a70d · 2024-07-09T00:47:38.000-04:00
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 number	Diff line change
`@@ -3,5 +3,7 @@ let`
`3`	`3`	`inherit (config.networking) hostName;`
`4`	`4`	`in`
`5`	`5`	`{`
	`6`	`+ services.tailscale.enable = true;`
	`7`	`+`
`6`	`8`	`networking.domain = ops.hosts.${hostName}.domain;`
`7`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,6 @@ in`
`7`	`7`	`networking.nameservers = dns.nameservers.cloudflare;`
`8`	`8`
`9`	`9`	`# Allow this host to function as a Tailscale exit node.`
	`10`	`+ services.tailscale.enable = true;`
`10`	`11`	`services.tailscale.useRoutingFeatures = "both";`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@`
`26`	`26`	`time.timeZone = "America/New_York";`
`27`	`27`	`networking.firewall.enable = true;`
`28`	`28`
	`29`	`+ services.tailscale.enable = true;`
	`30`	`+`
`29`	`31`	`system.stateVersion = "22.05";`
`30`	`32`	`}`