Browse Source

fix ssh domain default value to domain (#930)

tags/v1.2.0-rc1
Lunny Xiao GitHub 9 years ago
parent
commit
1f2edb4a88
1 changed files with 4 additions and 1 deletions
  1. +4
    -1
      modules/setting/setting.go

+ 4
- 1
modules/setting/setting.go View File

@@ -96,7 +96,7 @@ var (
}{ }{
Disabled: false, Disabled: false,
StartBuiltinServer: false, StartBuiltinServer: false,
Domain: "localhost",
Domain: "",
Port: 22, Port: 22,
KeygenPath: "ssh-keygen", KeygenPath: "ssh-keygen",
} }
@@ -623,6 +623,9 @@ please consider changing to GITEA_CUSTOM`)
LandingPageURL = LandingPageHome LandingPageURL = LandingPageHome
} }


if len(SSH.Domain) == 0 {
SSH.Domain = Domain
}
SSH.RootPath = path.Join(homeDir, ".ssh") SSH.RootPath = path.Join(homeDir, ".ssh")
SSH.KeyTestPath = os.TempDir() SSH.KeyTestPath = os.TempDir()
if err = Cfg.Section("server").MapTo(&SSH); err != nil { if err = Cfg.Section("server").MapTo(&SSH); err != nil {


Loading…
Cancel
Save