Skip to content

Commit 26af9bb

Browse files
committed
cmd/tailmix,docs: use "ts login" for first-time setup
Point the README, Linux guide, help text, and no-profile error at "sudo tailmix ts login". "ts up" still creates the default profile too. Change-Id: I9150a91cc1af44f63232ed2c32eac8db763ad43d
1 parent a7a7c42 commit 26af9bb

5 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ For Linux prerequisites and troubleshooting, see the
3737
### 2. Connect your first tailnet
3838

3939
```sh
40-
sudo tailmix ts up
40+
sudo tailmix ts login
4141
```
4242

4343
Open the login link it prints. tailmix creates a profile named `default` for

‎cmd/tailmix/main.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,8 +1008,8 @@ func runTailscale(ctx context.Context, client managementClient, socketDir string
10081008
return deps.runCLI(ctx, cliArgs)
10091009
}
10101010

1011-
// defaultProfileName names the profile that "tailmix ts up" and
1012-
// "tailmix ts login" create when no Tailscale profile exists yet.
1011+
// defaultProfileName names the profile that "tailmix ts login" and
1012+
// "tailmix ts up" create when no Tailscale profile exists yet.
10131013
const defaultProfileName = "default"
10141014

10151015
// implicitTailscaleProfile selects the profile for a "tailmix ts" command run
@@ -1035,7 +1035,7 @@ func implicitTailscaleProfile(ctx context.Context, client managementClient, subc
10351035
return only, nil
10361036
case 0:
10371037
if subcommand != "up" && subcommand != "login" {
1038-
return controlapi.Profile{}, usageError{`no Tailscale profiles yet; run "tailmix ts up" to create one`}
1038+
return controlapi.Profile{}, usageError{`no Tailscale profiles yet; run "sudo tailmix ts login" to create one`}
10391039
}
10401040
created, err := client.AddProfile(ctx, controlapi.AddProfileRequest{Name: defaultProfileName})
10411041
if err != nil {
@@ -1765,7 +1765,7 @@ const tailscaleHelp = `Usage:
17651765
Profile option: -p, --profile <profile>
17661766
17671767
--profile may be omitted when exactly one Tailscale profile exists. If none
1768-
exist, "tailmix ts up" and "tailmix ts login" create a profile named "default".
1768+
exist, "tailmix ts login" (or "tailmix ts up") creates a profile named "default".
17691769
17701770
All remaining arguments are passed unchanged to Tailscale's upstream CLI.
17711771
The --socket option is owned by tailmix and cannot be overridden.

‎cmd/tailmix/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,7 @@ func TestTSWithoutProfile(t *testing.T) {
11691169
profiles: []controlapi.Profile{},
11701170
args: []string{"ts", "status"},
11711171
wantCode: 2,
1172-
wantStderr: `no Tailscale profiles yet; run "tailmix ts up" to create one`,
1172+
wantStderr: `no Tailscale profiles yet; run "sudo tailmix ts login" to create one`,
11731173
},
11741174
{
11751175
name: "multiple profiles require a choice",

‎docs/linux-install.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ You need systemd, `curl`, and root access.
2222
3. Log in to your first tailnet:
2323

2424
```sh
25-
sudo tailmix ts up
25+
sudo tailmix ts login
2626
```
2727

2828
Open the login link it prints. tailmix creates a profile named `default`.

‎docs/profile-management.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ policy remains authoritative.
134134
raw WireGuard and removed profiles are not counted. With several, it fails and
135135
lists their names. With none, `up` and `login` first add a profile named
136136
`default` and report it on standard error, so a first-time setup is one
137-
command (`sudo tailmix ts up`). Other subcommands fail instead of creating
137+
command (`sudo tailmix ts login`). Other subcommands fail instead of creating
138138
state.
139139

140140
Every tailmix `--profile` option also accepts the short form `-p`. The

0 commit comments

Comments
 (0)