diff --git a/net/dns/manager_windows.go b/net/dns/manager_windows.go index 4c05b7718a04b..01133d8c0c64c 100644 --- a/net/dns/manager_windows.go +++ b/net/dns/manager_windows.go @@ -110,11 +110,11 @@ func setTailscaleHosts(prevHostsFile []byte, hosts []*HostEntry) ([]byte, error) b := bytes.ReplaceAll(prevHostsFile, []byte("\r\n"), []byte("\n")) sc := bufio.NewScanner(bytes.NewReader(b)) const ( - header = "# TailscaleHostsSectionStart" - footer = "# TailscaleHostsSectionEnd" + header = "# CoderHostsSectionStart" + footer = "# CoderHostsSectionEnd" ) var comments = []string{ - "# This section contains MagicDNS entries for Tailscale.", + "# This section contains DNS entries for Coder workspaces.", "# Do not edit this section manually.", } var out bytes.Buffer diff --git a/net/dns/nrpt_windows.go b/net/dns/nrpt_windows.go index f81cdb42f3e43..d64110f4320c6 100644 --- a/net/dns/nrpt_windows.go +++ b/net/dns/nrpt_windows.go @@ -29,7 +29,9 @@ const ( // This is the legacy rule ID that previous versions used when we supported // only a single rule. Now that we support multiple rules are required, we // generate their GUIDs and store them under the Tailscale registry key. - nrptSingleRuleID = `{5abe529b-675b-4486-8459-25a634dacc23}` + // + // Coder: this value was changed to avoid messing with Tailscale. + nrptSingleRuleID = `{09040707-2be9-491d-9d7b-62a454e774d2}` // This is the name of the registry value we use to save Rule IDs under // the Tailscale registry key. diff --git a/util/winutil/winutil_windows.go b/util/winutil/winutil_windows.go index 89fc543db20cc..c3b19301920bb 100644 --- a/util/winutil/winutil_windows.go +++ b/util/winutil/winutil_windows.go @@ -20,8 +20,8 @@ import ( ) const ( - regBase = `SOFTWARE\Tailscale IPN` - regPolicyBase = `SOFTWARE\Policies\Tailscale` + regBase = `SOFTWARE\Coder VPN` + regPolicyBase = `SOFTWARE\Policies\Coder` ) // ErrNoShell is returned when the shell process is not found.