Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

fix: Change SSH port for p2p #339

Merged
merged 4 commits into from
May 10, 2021
Merged

fix: Change SSH port for p2p #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0431e13
fix: Change SSH port for p2p
kylecarbs May 10, 2021
45efe44
Fix formatting
kylecarbs May 10, 2021
7778fbc
Change to debug log
kylecarbs May 10, 2021
ea01d59
Update hostname
kylecarbs May 10, 2021
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
7 changes: 4 additions & 3 deletions internal/cmd/configssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,15 @@ func makeSSHConfig(host, userName, envName, privateKeyFilepath string, p2p bool)
if p2p {
return fmt.Sprintf(
`Host coder.%s
HostName localhost
ProxyCommand coder tunnel %s 22 stdio
HostName coder.%s
ProxyCommand coder tunnel %s 12213 stdio
StrictHostKeyChecking no
ConnectTimeout=0
IdentitiesOnly yes
IdentityFile="%s"
ServerAliveInterval 60
ServerAliveCountMax 3
`, envName, envName, privateKeyFilepath)
`, envName, envName, envName, privateKeyFilepath)
}

return fmt.Sprintf(
Expand Down
4 changes: 2 additions & 2 deletions internal/cmd/tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ func (c *tunnneler) start(ctx context.Context) error {
return xerrors.Errorf("dial ice: %w", err)
}

c.log.Info(ctx, "Connecting to workspace...")
c.log.Debug(ctx, "Connecting to workspace...")
wd, err := wsnet.DialWebsocket(ctx, wsnet.ConnectEndpoint(c.brokerAddr, c.workspaceID, c.token), []webrtc.ICEServer{server})
if err != nil {
return xerrors.Errorf("creating workspace dialer: %w", err)
Expand All @@ -135,7 +135,7 @@ func (c *tunnneler) start(ctx context.Context) error {
if err != nil {
return err
}
c.log.Info(ctx, "Connected to workspace!")
c.log.Debug(ctx, "Connected to workspace!")

// proxy via stdio
if c.stdio {
Expand Down