From 0fa66ce699babb0d0d992e154583b4c95492077d Mon Sep 17 00:00:00 2001
From: Hilton Chain <hako@ultrarare.space>
Date: Sat, 25 Oct 2025 15:48:36 +0800
Subject: [PATCH] services: tailscale: Run with inherited environment
 variables.

* modules/rosenthal/services/networking.scm (tailscale-configuration)
[iptables]: Remove field.
(tailscale-shepherd-service): Remove configuration to environment variables.
---
 modules/rosenthal/services/networking.scm | 47 +++++++++--------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/modules/rosenthal/services/networking.scm b/modules/rosenthal/services/networking.scm
index 5e9b8c3..ce109b7 100644
--- a/modules/rosenthal/services/networking.scm
+++ b/modules/rosenthal/services/networking.scm
@@ -107,10 +107,6 @@
    (file-like tailscale)
    "The tailscale package to use.")
 
-  (iptables
-   (file-like iptables-nft)
-   "The iptables package to use.")
-
   (log-file
    (string "/var/log/tailscaled.log")
    "Path to log file.")
@@ -141,32 +137,25 @@ to #f.")
 
 (define tailscale-shepherd-service
   (match-record-lambda <tailscale-configuration>
-      (tailscale iptables log-file socket state-directory
+      (tailscale log-file socket state-directory
                  upload-log? verbosity extra-options)
-    (let ((environment
-           #~(list (string-append "PATH="
-                                  (string-join
-                                   '(#$(file-append iptables "/sbin")
-                                     #$(file-append iproute "/sbin"))
-                                   ":")))))
-      (list (shepherd-service
-             (documentation "Run tailscaled")
-             (provision '(tailscaled))
-             (requirement '(user-processes))
-             (start
-              #~(make-forkexec-constructor
-                 (list
-                  #$(file-append tailscale "/bin/tailscaled")
-                  #$@(if upload-log?
-                         '()
-                         '("-no-logs-no-support"))
-                  "-socket" #$socket
-                  "-statedir" #$state-directory
-                  "-verbose" #$(number->string verbosity)
-                  #$@extra-options)
-                 #:environment-variables #$environment
-                 #:log-file #$log-file))
-             (stop #~(make-kill-destructor)))))))
+    (list (shepherd-service
+            (documentation "Run tailscaled")
+            (provision '(tailscaled))
+            (requirement '(user-processes))
+            (start
+             #~(make-forkexec-constructor
+                (list
+                 #$(file-append tailscale "/bin/tailscaled")
+                 #$@(if upload-log?
+                        '()
+                        '("-no-logs-no-support"))
+                 "-socket" #$socket
+                 "-statedir" #$state-directory
+                 "-verbose" #$(number->string verbosity)
+                 #$@extra-options)
+                #:log-file #$log-file))
+            (stop #~(make-kill-destructor))))))
 
 (define tailscale-service-type
   (service-type