TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-05-07 08:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

paths, cmd/tailscaled: on Windows, don't try to migrate from legacy relay.conf

Browse Source 
Avoids confusing logspam on Windows.
This commit is contained in:
Brad Fitzpatrick 2020-07-13 08:59:01 -07:00
parent 61abab999e
commit f98706bdb3
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/tailscaled/tailscaled.go
View File

@ -126,7 +126,7 @@ func main() {
Port: 41112, Port: 41112,
StatePath: *statepath, StatePath: *statepath,
AutostartStateKey: globalStateKey, AutostartStateKey: globalStateKey,
LegacyConfigPath: paths.LegacyConfigPath, LegacyConfigPath: paths.LegacyConfigPath(),
SurviveDisconnects: true, SurviveDisconnects: true,
DebugMux: debugMux, DebugMux: debugMux,
} }

12
paths/paths.go
View File

@ -11,9 +11,15 @@ import (
"runtime" "runtime"
) )
// LegacyConfigPath is the path used by the pre-tailscaled "relaynode" // LegacyConfigPath returns the path used by the pre-tailscaled
// daemon's config file. // "relaynode" daemon's config file. It returns the empty string for
const LegacyConfigPath = "/var/lib/tailscale/relay.conf" // platforms where relaynode never ran.
func LegacyConfigPath() string {
if runtime.GOOS == "windows" {
return ""
}
return "/var/lib/tailscale/relay.conf"
}
// DefaultTailscaledSocket returns the path to the tailscaled Unix socket // DefaultTailscaledSocket returns the path to the tailscaled Unix socket
// or the empty string if there's no reasonable default. // or the empty string if there's no reasonable default.