diff --git a/ipn/prefs.go b/ipn/prefs.go index 912262d1c..4b8d359f6 100644 --- a/ipn/prefs.go +++ b/ipn/prefs.go @@ -28,7 +28,7 @@ import ( // DefaultControlURL returns the URL base of the control plane // ("coordination server") for use when no explicit one is configured. // The default control plane is the hosted version run by Tailscale.com. -const DefaultControlURL = "https://login.tailscale.com" +const DefaultControlURL = "https://controlplane.tailscale.com" // Prefs are the user modifiable settings of the Tailscale node agent. type Prefs struct { diff --git a/ipn/prefs_test.go b/ipn/prefs_test.go index 7d4311b58..52ae4f6a4 100644 --- a/ipn/prefs_test.go +++ b/ipn/prefs_test.go @@ -92,13 +92,13 @@ func TestPrefsEqual(t *testing.T) { }, { - &Prefs{ControlURL: "https://login.tailscale.com"}, + &Prefs{ControlURL: "https://controlplane.tailscale.com"}, &Prefs{ControlURL: "https://login.private.co"}, false, }, { - &Prefs{ControlURL: "https://login.tailscale.com"}, - &Prefs{ControlURL: "https://login.tailscale.com"}, + &Prefs{ControlURL: "https://controlplane.tailscale.com"}, + &Prefs{ControlURL: "https://controlplane.tailscale.com"}, true, }, @@ -324,7 +324,7 @@ func TestBasicPrefs(t *testing.T) { tstest.PanicOnLog() p := Prefs{ - ControlURL: "https://login.tailscale.com", + ControlURL: "https://controlplane.tailscale.com", } checkPrefs(t, p) } @@ -336,7 +336,7 @@ func TestPrefsPersist(t *testing.T) { LoginName: "test@example.com", } p := Prefs{ - ControlURL: "https://login.tailscale.com", + ControlURL: "https://controlplane.tailscale.com", CorpDNS: true, Persist: &c, } diff --git a/net/dnsfallback/dnsfallback.go b/net/dnsfallback/dnsfallback.go index ec20279aa..06fdd1ec3 100644 --- a/net/dnsfallback/dnsfallback.go +++ b/net/dnsfallback/dnsfallback.go @@ -87,7 +87,7 @@ func Lookup(ctx context.Context, host string) ([]netaddr.IP, error) { } // serverName and serverIP of are, say, "derpN.tailscale.com". -// queryName is the name being sought (e.g. "login.tailscale.com"), passed as hint. +// queryName is the name being sought (e.g. "controlplane.tailscale.com"), passed as hint. func bootstrapDNSMap(ctx context.Context, serverName string, serverIP netaddr.IP, queryName string) (dnsMap, error) { dialer := netns.NewDialer() tr := http.DefaultTransport.(*http.Transport).Clone() diff --git a/net/interfaces/interfaces.go b/net/interfaces/interfaces.go index ddd290c5f..405c531f7 100644 --- a/net/interfaces/interfaces.go +++ b/net/interfaces/interfaces.go @@ -22,7 +22,7 @@ import ( // LoginEndpointForProxyDetermination is the URL used for testing // which HTTP proxy the system should use. -var LoginEndpointForProxyDetermination = "https://login.tailscale.com/" +var LoginEndpointForProxyDetermination = "https://controlplane.tailscale.com/" // Tailscale returns the current machine's Tailscale interface, if any. // If none is found, all zero values are returned.