Skip to content

Fixups: WUSH_AUTH_KEY instead of WUSH_AUTH_key, remove mentions of wush receive #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Fixups: WUSH_AUTH_KEY instead of WUSH_AUTH_key, remove mentions of wush receive #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30ad2dc
cp.go & portforward.go: use `WUSH_AUTH_KEY`, not `WUSH_AUTH_key`
ilyagr Sep 16, 2024
a51aa0a
Replace `wush receive` with `wush serve`
ilyagr Sep 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ coder@colin:~$

`wush` doesn't require you to trust any 3rd party authentication or relay
servers, instead using x25519 keys to authenticate incoming connections. Auth
keys generated by `wush receive` are separated into a couple parts:
keys generated by `wush serve` are separated into a couple parts:

```text
112v1RyL5KPzsbMbhT7fkEGrcfpygxtnvwjR5kMLGxDHGeLTK1BvoPqsUcjo7xyMkFn46KLTdedKuPCG5trP84mz9kx
Expand Down
4 changes: 2 additions & 2 deletions cmd/wush/cp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,8 +212,8 @@ func cpCmd() *serpent.Command {
Options: []serpent.Option{
{
Flag: "auth-key",
Env: "WUSH_AUTH_key",
Description: "The auth key returned by " + cliui.Code("wush receive") + ". If not provided, it will be asked for on startup.",
Env: "WUSH_AUTH_KEY",
Description: "The auth key returned by " + cliui.Code("wush serve") + ". If not provided, it will be asked for on startup.",
Default: "",
Value: serpent.StringOf(&overlayOpts.authKey),
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/wush/portforward.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@ func portForwardCmd() *serpent.Command {
Options: []serpent.Option{
{
Flag: "auth-key",
Env: "WUSH_AUTH_key",
Description: "The auth key returned by " + cliui.Code("wush receive") + ". If not provided, it will be asked for on startup.",
Env: "WUSH_AUTH_KEY",
Description: "The auth key returned by " + cliui.Code("wush serve") + ". If not provided, it will be asked for on startup.",
Default: "",
Value: serpent.StringOf(&overlayOpts.authKey),
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/wush/rsync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ func rsyncCmd() *serpent.Command {
{
Flag: "auth-key",
Env: "WUSH_AUTH_KEY",
Description: "The auth key returned by " + cliui.Code("wush receive") + ". If not provided, it will be asked for on startup.",
Description: "The auth key returned by " + cliui.Code("wush serve") + ". If not provided, it will be asked for on startup.",
Default: "",
Value: serpent.StringOf(&overlayOpts.authKey),
},
Expand Down
4 changes: 2 additions & 2 deletions cmd/wush/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func sshCmd() *serpent.Command {
Aliases: []string{},
Short: "Open a shell.",
Long: "Opens an SSH connection to a " + cliui.Code("wush") + " peer. " +
"Use " + cliui.Code("wush receive") + " on the computer you would like to connect to.",
"Use " + cliui.Code("wush serve") + " on the computer you would like to connect to.",
Middleware: serpent.Chain(
initLogger(&verbose, &quiet, logger, &logf),
initAuth(&overlayOpts.authKey, &overlayOpts.clientAuth),
Expand Down Expand Up @@ -91,7 +91,7 @@ func sshCmd() *serpent.Command {
{
Flag: "auth-key",
Env: "WUSH_AUTH_KEY",
Description: "The auth key returned by " + cliui.Code("wush receive") + ". If not provided, it will be asked for on startup.",
Description: "The auth key returned by " + cliui.Code("wush serve") + ". If not provided, it will be asked for on startup.",
Default: "",
Value: serpent.StringOf(&overlayOpts.authKey),
},
Expand Down