TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

envknob: support tailscaled-env.txt on macOS too

Browse Source 
Updates #3707

Co-authored-by: Marwan Sulaiman <marwan@tailscale.com>
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2023-05-04 10:17:54 -07:00 committed by Brad Fitzpatrick
parent 787fc41fa4
commit 73d128238e
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
envknob/envknob.go
View File

@ -457,13 +457,24 @@ func PanicIfAnyEnvCheckedInInit() {
// ApplyDiskConfigError returns the most recent result of ApplyDiskConfig. // ApplyDiskConfigError returns the most recent result of ApplyDiskConfig.
func ApplyDiskConfigError() error { return applyDiskConfigErr } func ApplyDiskConfigError() error { return applyDiskConfigErr }
// ApplyDiskConfig returns a platform-specific config file of environment keys/values and // ApplyDiskConfig returns a platform-specific config file of environment
// applies them. On Linux and Unix operating systems, it's a no-op and always returns nil. // keys/values and applies them. On Linux and Unix operating systems, it's a
// If no platform-specific config file is found, it also returns nil. // no-op and always returns nil. If no platform-specific config file is found,
// it also returns nil.
//
// It exists primarily for Windows and macOS to make it easy to apply
// environment variables to a running service in a way similar to modifying
// /etc/default/tailscaled on Linux.
// //
// It exists primarily for Windows to make it easy to apply environment variables to
// a running service in a way similar to modifying /etc/default/tailscaled on Linux.
// On Windows, you use %ProgramData%\Tailscale\tailscaled-env.txt instead. // On Windows, you use %ProgramData%\Tailscale\tailscaled-env.txt instead.
//
// On macOS, use one of:
//
// - ~/Library/Containers/io.tailscale.ipn.macsys/Data/tailscaled-env.txt
// for standalone macOS GUI builds
// - ~/Library/Containers/io.tailscale.ipn.macos.network-extension/Data/tailscaled-env.txt
// for App Store builds
// - /etc/tailscale/tailscaled-env.txt for tailscaled-on-macOS (homebrew, etc)
func ApplyDiskConfig() (err error) { func ApplyDiskConfig() (err error) {
var f *os.File var f *os.File
defer func() { defer func() {
@ -512,9 +523,15 @@ func getPlatformEnvFile() string {
return "/etc/tailscale/tailscaled-env.txt" return "/etc/tailscale/tailscaled-env.txt"
} }
case "darwin": case "darwin":
// TODO(bradfitz): figure this out. There are three ways to run if version.IsSandboxedMacOS() { // the two GUI variants (App Store or separate download)
// Tailscale on macOS (tailscaled, GUI App Store, GUI System Extension) // This will be user-visible as ~/Library/Containers/$VARIANT/Data/tailscaled-env.txt
// and we should deal with all three. // where $VARIANT is "io.tailscale.ipn.macsys" for macsys (downloadable mac GUI builds)
// or "io.tailscale.ipn.macos.network-extension" for App Store builds.
return filepath.Join(os.Getenv("HOME"), "tailscaled-env.txt")
} else {
// Open source / homebrew variable, running tailscaled-on-macOS.
return "/etc/tailscale/tailscaled-env.txt"
}
} }
return "" return ""
} }