Skip to content

Commit

Permalink
Remove SSH apps from default visor config generation
Browse files Browse the repository at this point in the history
  • Loading branch information
Darkren committed Dec 24, 2019
1 parent 164c995 commit e2ea0ed
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 27 deletions.
20 changes: 0 additions & 20 deletions cmd/skywire-cli/commands/node/gen-config.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ func defaultConfig() *visor.Config {
//passcode := base64.StdEncoding.Strict().EncodeToString(cipher.RandByte(8))
conf.Apps = []visor.AppConfig{
defaultSkychatConfig(),
defaultSkysshConfig(),
defaultSkyproxyConfig(""),
defaultSkysshClientConfig(),
defaultSkyproxyClientConfig(),
}
conf.TrustedNodes = []cipher.PubKey{}
Expand Down Expand Up @@ -164,15 +162,6 @@ func defaultSkychatConfig() visor.AppConfig {
}
}

func defaultSkysshConfig() visor.AppConfig {
return visor.AppConfig{
App: skyenv.SkysshName,
Version: skyenv.SkysshVersion,
AutoStart: true,
Port: routing.Port(skyenv.SkysshPort),
}
}

func defaultSkyproxyConfig(passcode string) visor.AppConfig {
var args []string
if passcode != "" {
Expand All @@ -187,15 +176,6 @@ func defaultSkyproxyConfig(passcode string) visor.AppConfig {
}
}

func defaultSkysshClientConfig() visor.AppConfig {
return visor.AppConfig{
App: skyenv.SkysshClientName,
Version: skyenv.SkysshVersion,
AutoStart: true,
Port: routing.Port(skyenv.SkysshClientPort),
}
}

func defaultSkyproxyClientConfig() visor.AppConfig {
return visor.AppConfig{
App: skyenv.SkyproxyClientName,
Expand Down
9 changes: 2 additions & 7 deletions internal/skyenv/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,13 @@ const (
SkychatPort = uint16(1)
SkychatAddr = ":8000"

SkysshName = "SSH"
SkysshVersion = "1.0"
SkysshPort = uint16(2)
SkysshPort = uint16(2)

SkyproxyName = "socksproxy"
SkyproxyVersion = "1.0"
SkyproxyPort = uint16(3)

SkysshClientName = "SSH-client"
SkysshClientVersion = "1.0"
SkysshClientPort = uint16(12)
SkysshClientAddr = ":2222"
SkysshClientAddr = ":2222"

SkyproxyClientName = "socksproxy-client"
SkyproxyClientVersion = "1.0"
Expand Down

0 comments on commit e2ea0ed

Please sign in to comment.