mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-11-03 20:36:07 +01:00 
			
		
		
		
	Allow an SSHDomain configuration option. Defaults to Domain, preserves legacy behavior
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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()
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user