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

Avoids confusing logspam on Windows.
reviewable/pr536/r2
Brad Fitzpatrick 4 years ago
parent 61abab999e
commit f98706bdb3

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

@ -11,9 +11,15 @@ import (
"runtime"
)
// LegacyConfigPath is the path used by the pre-tailscaled "relaynode"
// daemon's config file.
const LegacyConfigPath = "/var/lib/tailscale/relay.conf"
// LegacyConfigPath returns the path used by the pre-tailscaled
// "relaynode" daemon's config file. It returns the empty string for
// 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
// or the empty string if there's no reasonable default.

Loading…
Cancel
Save