seasharp/Rosenthal
1
0
Fork 0
mirror of https://codeberg.org/hako/Rosenthal.git synced 2025-11-16 01:14:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: seasharp:f4d7a54232f304e66684e8460d5e0adc4bd6532f
Branches Tags
seasharp:trunk
seasharp:keyring
...
compare: seasharp:1b87867f0024bea0653edf1f47ed449b9511b521
Branches Tags
seasharp:trunk
seasharp:keyring

3 Commits
f4d7a54232 ... 1b87867f00

Author SHA1 Message Date
Hilton Chain
1b87867f00
rosenthal: tailscale: Adjust root user's PATH for Tailscale SSH. 2025-10-25 19:28:07 +08:00
Hilton Chain
409fad8307
rosenthal: tailscale: Adjust default PATH for Tailscale SSH. 
* modules/rosenthal/packages/networking.scm (tailscale) [arguments]: Add
/run/current-system/profile/bin to Tailscale SSH's default PATH.
 2025-10-25 17:59:35 +08:00
Hilton Chain
0fa66ce699
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.
 2025-10-25 15:51:11 +08:00
2 changed files with 38 additions and 29 deletions
Show Stats Expand all files Collapse all files

20
modules/rosenthal/packages/networking.scm
View File

@ -319,6 +319,26 @@ a SOCKS5 proxy.")
"derpprobe"
"tailscaled"
"tsidp")))))
(add-after 'unpack 'fix-paths
(lambda _
(substitute* "ssh/tailssh/user.go"
(((format #f "(\")(~a|~a\")"
(string-join
'("/usr/local/sbin"
"/usr/local/bin"
"/usr/sbin"
"/usr/bin"
"/sbin"
"/bin")
":")
(string-join
'("/usr/local/bin"
"/usr/bin"
"/bin")
":"))
_ prefix suffix)
(format #f "~a/run/current-system/profile/bin:~a"
prefix suffix)))))
(add-after 'install 'install-extras
(lambda _
(symlink (in-vicinity #$output "bin/tailscaled")

15
modules/rosenthal/services/networking.scm
View File

@ -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,14 +137,8 @@ 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))
@ -164,9 +154,8 @@ to #f.")
"-statedir" #$state-directory
"-verbose" #$(number->string verbosity)
#$@extra-options)
#:environment-variables #$environment
#:log-file #$log-file))
(stop #~(make-kill-destructor)))))))
(stop #~(make-kill-destructor))))))
(define tailscale-service-type
(service-type