Diff
1diff --git a/server/config/config.go b/server/config/config.go
2index b0112d93b8b53d1bfa90a59a1d57de1bab559a0f..ea4e42408ab4b8c26c7f9fc62b65d00290dd1005 100644
3--- a/server/config/config.go
4+++ b/server/config/config.go
5@@ -10,6 +10,10 @@ import (
6 "gopkg.in/yaml.v3"
7 )
8
9+var (
10+ logger = log.WithPrefix("server.config")
11+)
12+
13 // SSHConfig is the configuration for the SSH server.
14 type SSHConfig struct {
15 // ListenAddr is the address on which the SSH server will listen.
16@@ -91,7 +95,7 @@ type Config struct {
17 InitialAdminKeys []string `env:"INITIAL_ADMIN_KEY" envSeparator:"\n" yaml:"initial_admin_keys"`
18
19 // DataPath is the path to the directory where Soft Serve will store its data.
20- DataPath string `env:"DATA_PATH" envDefault:"data" yaml:"-"`
21+ DataPath string `env:"DATA_PATH" yaml:"-"`
22
23 // Backend is the Git backend to use.
24 Backend backend.Backend `yaml:"-"`
25diff --git a/server/jobs.go b/server/jobs.go
26index 6320a8f1b79d05eb5700f5039668ffd50cfed001..daf9a1a62b8487a7774f84a7d90d1235794c89a5 100644
27--- a/server/jobs.go
28+++ b/server/jobs.go
29@@ -38,7 +38,8 @@ func mirrorJob(cfg *config.Config) func() {
30 cmd.AddEnvs(
31 fmt.Sprintf(`GIT_SSH_COMMAND=ssh -o UserKnownHostsFile="%s" -o StrictHostKeyChecking=no -i "%s"`,
32 filepath.Join(cfg.DataPath, "ssh", "known_hosts"),
33- filepath.Join(cfg.DataPath, cfg.SSH.ClientKeyPath),
34+ // FIXME: upstream keygen appends _ed25519 to the key path.
35+ filepath.Join(cfg.DataPath, cfg.SSH.ClientKeyPath)+"_ed25519",
36 ),
37 )
38 if _, err := cmd.RunInDir(r.Path); err != nil {