diff options
Diffstat (limited to '')
| -rw-r--r-- | forged/internal/incoming/ssh/config.go | 9 | ||||
| -rw-r--r-- | forged/internal/incoming/ssh/ssh.go | 13 |
2 files changed, 7 insertions, 15 deletions
diff --git a/forged/internal/incoming/ssh/config.go b/forged/internal/incoming/ssh/config.go deleted file mode 100644 index 7d22cc1..0000000 --- a/forged/internal/incoming/ssh/config.go +++ /dev/null @@ -1,9 +0,0 @@ -package ssh - -type Config struct { - Net string `scfg:"net"` - Addr string `scfg:"addr"` - Key string `scfg:"key"` - Root string `scfg:"root"` - ShutdownTimeout uint32 `scfg:"shutdown_timeout"` -} diff --git a/forged/internal/incoming/ssh/ssh.go b/forged/internal/incoming/ssh/ssh.go index 527cd28..1f27be2 100644 --- a/forged/internal/incoming/ssh/ssh.go +++ b/forged/internal/incoming/ssh/ssh.go @@ -23,18 +23,19 @@ type Server struct { global *global.Global } -func New(config Config, global *global.Global) (server *Server, err error) { +func New(global *global.Global) (server *Server, err error) { + cfg := global.Config.SSH server = &Server{ - net: config.Net, - addr: config.Addr, - root: config.Root, - shutdownTimeout: config.ShutdownTimeout, + net: cfg.Net, + addr: cfg.Addr, + root: cfg.Root, + shutdownTimeout: cfg.ShutdownTimeout, global: global, } //exhaustruct:ignore var privkeyBytes []byte - privkeyBytes, err = os.ReadFile(config.Key) + privkeyBytes, err = os.ReadFile(cfg.Key) if err != nil { return server, fmt.Errorf("read SSH private key: %w", err) } |