Allow an SSHDomain configuration option. Defaults to Domain, preserves legacy behavior

diff --git a/models/repo.go b/models/repo.go
index 7b47c20b1eac48d77acbe49f6bb9a57b8260a1f1..cc4b53b0f299539945be92c4139bead0b2db6423 100644 (file)
--- a/models/repo.go
+++ b/models/repo.go
@@ -242,10 +242,11 @@ func (repo *Repository) CloneLink() (cl CloneLink, err error) {
        if err = repo.GetOwner(); err != nil {
                return cl, err
        }
+
        if setting.SSHPort != 22 {
-               cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", setting.RunUser, setting.Domain, setting.SSHPort, repo.Owner.LowerName, repo.LowerName)
+               cl.SSH = fmt.Sprintf("ssh://%s@%s:%d/%s/%s.git", setting.RunUser, setting.SSHDomain, setting.SSHPort, repo.Owner.LowerName, repo.LowerName)
        } else {
-               cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", setting.RunUser, setting.Domain, repo.Owner.LowerName, repo.LowerName)
+               cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", setting.RunUser, setting.SSHDomain, repo.Owner.LowerName, repo.LowerName)
        }
        cl.HTTPS = fmt.Sprintf("%s%s/%s.git", setting.AppUrl, repo.Owner.LowerName, repo.LowerName)
        return cl, nil

diff --git a/modules/setting/setting.go b/modules/setting/setting.go
index aefc3520f92528280a455ec75a3445fcace613d5..3ce27b2e3b5e4d2dcd8912344ed332a792a504e8 100644 (file)
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -53,6 +53,7 @@ var (
        HttpAddr, HttpPort string
        DisableSSH         bool
        SSHPort            int
+       SSHDomain          string
        OfflineMode        bool
        DisableRouterLog   bool
        CertFile, KeyFile  string
@@ -232,6 +233,7 @@ func NewConfigContext() {
        HttpAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
        HttpPort = sec.Key("HTTP_PORT").MustString("3000")
        DisableSSH = sec.Key("DISABLE_SSH").MustBool()
+       SSHDomain = sec.Key("SSH_DOMAIN").MustString(Domain)
        SSHPort = sec.Key("SSH_PORT").MustInt(22)
        OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
        DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()