From e2ea0edc971dd9a464e23ad24eef0b1a01980677 Mon Sep 17 00:00:00 2001 From: Sir Darkrengarius Date: Tue, 24 Dec 2019 15:19:32 +0300 Subject: [PATCH] Remove SSH apps from default visor config generation --- cmd/skywire-cli/commands/node/gen-config.go | 20 -------------------- internal/skyenv/const.go | 9 ++------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/cmd/skywire-cli/commands/node/gen-config.go b/cmd/skywire-cli/commands/node/gen-config.go index 8cc27ab4a..a9f1141f6 100644 --- a/cmd/skywire-cli/commands/node/gen-config.go +++ b/cmd/skywire-cli/commands/node/gen-config.go @@ -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{} @@ -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 != "" { @@ -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, diff --git a/internal/skyenv/const.go b/internal/skyenv/const.go index 40593c086..d2d17c317 100644 --- a/internal/skyenv/const.go +++ b/internal/skyenv/const.go @@ -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"