mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-06 23:44:20 -04:00
Add new config option for builtin SSH server
Config option [server] SSH_LISTEN_PORT to the port the builtin SSH server will be listen. It can be different from SSH_PORT which is supposed to be exposed in the clone URL. This should solve the problem when user runs Gogs inside Docker container and still want to use builtin SSH server.
This commit is contained in:
parent
baaf6046a1
commit
4438b7793b
@ -63,8 +63,13 @@ LOCAL_ROOT_URL = http://localhost:%(HTTP_PORT)s/
|
||||
DISABLE_SSH = false
|
||||
; Whether use builtin SSH server or not.
|
||||
START_SSH_SERVER = false
|
||||
; Domain name to be exposed in clone URL
|
||||
SSH_DOMAIN = %(DOMAIN)s
|
||||
; Port number to be exposed in clone URL
|
||||
SSH_PORT = 22
|
||||
; Root path of SSH directory
|
||||
; Port number builtin SSH server listens on
|
||||
SSH_LISTEN_PORT = %(SSH_PORT)s
|
||||
; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
|
||||
SSH_ROOT_PATH =
|
||||
; Disable CDN even in "prod" mode
|
||||
OFFLINE_MODE = false
|
||||
|
2
gogs.go
2
gogs.go
@ -17,7 +17,7 @@ import (
|
||||
"github.com/gogits/gogs/modules/setting"
|
||||
)
|
||||
|
||||
const APP_VER = "0.8.44.0224"
|
||||
const APP_VER = "0.8.44.0225"
|
||||
|
||||
func init() {
|
||||
runtime.GOMAXPROCS(runtime.NumCPU())
|
||||
|
File diff suppressed because one or more lines are too long
@ -65,6 +65,7 @@ var (
|
||||
StartSSHServer bool
|
||||
SSHDomain string
|
||||
SSHPort int
|
||||
SSHListenPort int
|
||||
SSHRootPath string
|
||||
OfflineMode bool
|
||||
DisableRouterLog bool
|
||||
@ -324,6 +325,7 @@ func NewContext() {
|
||||
}
|
||||
SSHDomain = sec.Key("SSH_DOMAIN").MustString(Domain)
|
||||
SSHPort = sec.Key("SSH_PORT").MustInt(22)
|
||||
SSHListenPort = sec.Key("SSH_LISTEN_PORT").MustInt(SSHPort)
|
||||
SSHRootPath = sec.Key("SSH_ROOT_PATH").MustString(path.Join(homeDir, ".ssh"))
|
||||
if err := os.MkdirAll(SSHRootPath, 0700); err != nil {
|
||||
log.Fatal(4, "Fail to create '%s': %v", SSHRootPath, err)
|
||||
|
@ -89,8 +89,8 @@ func GlobalInit() {
|
||||
checkRunMode()
|
||||
|
||||
if setting.StartSSHServer {
|
||||
ssh.Listen(setting.SSHPort)
|
||||
log.Info("SSH server started on :%v", setting.SSHPort)
|
||||
ssh.Listen(setting.SSHListenPort)
|
||||
log.Info("SSH server started on :%v", setting.SSHListenPort)
|
||||
}
|
||||
|
||||
// Build Sanitizer
|
||||
|
@ -1 +1 @@
|
||||
0.8.44.0224
|
||||
0.8.44.0225
|
Loading…
Reference in New Issue
Block a user