From 2ad19740fc71e00b911c4eae21f63baf33b10a2f Mon Sep 17 00:00:00 2001 From: lmika Date: Tue, 16 Jun 2026 12:40:10 +0000 Subject: [PATCH 1/3] Dumped file content --- services.go | 1 + 1 file changed, 1 insertion(+) diff --git a/services.go b/services.go index 3a55d65..56abaa8 100644 --- a/services.go +++ b/services.go @@ -116,6 +116,7 @@ func runCmdExpectingOutput(cmd ...string) (string, error) { func writeFile(path string, content string, mode os.FileMode) error { fullPath := os.ExpandEnv(path) log.Printf(" .. [file] %v (%v bytes)", fullPath, len(content)) + log.Printf(" .. [file] %v", content) return os.WriteFile(fullPath, []byte(content), mode) } From 657104bf912222cd747fca76d1fdfc6c16b7587e Mon Sep 17 00:00:00 2001 From: lmika Date: Tue, 16 Jun 2026 21:35:31 +0000 Subject: [PATCH 2/3] Made the key filename ECDSA --- services.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/services.go b/services.go index 56abaa8..cb2ea0a 100644 --- a/services.go +++ b/services.go @@ -12,10 +12,11 @@ import ( type Services struct { cfg config + keyFileName string } func NewServices(cfg config) *Services { - return &Services{cfg: cfg} + return &Services{cfg: cfg, keyFileName: "id_ecdsa"} } func (s *Services) AddPrivateKey() error { @@ -25,7 +26,7 @@ func (s *Services) AddPrivateKey() error { return err } - if err := writeFile(`${HOME}/.ssh/id_rsa`, s.cfg.PrivateKey, 0400); err != nil { + if err := writeFile(`${HOME}/.ssh/` + s.keyFileName, s.cfg.PrivateKey, 0400); err != nil { return err } @@ -39,9 +40,11 @@ func (s *Services) ConfigureSSH() error { if err := sshConfigTemplate.Execute(&bfr, struct { Cfg config Home string + KeyFileName string }{ Cfg: s.cfg, Home: os.Getenv("HOME"), + KeyFileName: s.keyFileName, }); err != nil { return err } @@ -115,8 +118,7 @@ func runCmdExpectingOutput(cmd ...string) (string, error) { func writeFile(path string, content string, mode os.FileMode) error { fullPath := os.ExpandEnv(path) - log.Printf(" .. [file] %v (%v bytes)", fullPath, len(content)) - log.Printf(" .. [file] %v", content) + log.Printf(" .. [file] %v (%v bytes)", fullPath, len(content)) return os.WriteFile(fullPath, []byte(content), mode) } @@ -129,6 +131,6 @@ Host * Host {{.Cfg.HostName}} HostName {{.Cfg.HostName}} User dokku - IdentityFile {{.Home}}/.ssh/id_rsa + IdentityFile {{.Home}}/.ssh/{{.KeyFileName}} `)) ) From 366102b55bd788ab375d736cac296c7cbc40ddc0 Mon Sep 17 00:00:00 2001 From: lmika Date: Tue, 16 Jun 2026 22:46:25 +0000 Subject: [PATCH 3/3] Added trailing space to the private key --- services.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services.go b/services.go index cb2ea0a..c4548e3 100644 --- a/services.go +++ b/services.go @@ -26,7 +26,8 @@ func (s *Services) AddPrivateKey() error { return err } - if err := writeFile(`${HOME}/.ssh/` + s.keyFileName, s.cfg.PrivateKey, 0400); err != nil { + privateKey := strings.TrimSpace(s.cfg.PrivateKey) + "\n" + if err := writeFile(`${HOME}/.ssh/` + s.keyFileName, privateKey, 0400); err != nil { return err }