Merge pull request #2137 from nanoant/patch/ssh-trigger-via-local-url
LOCAL_ROOT_URL for workers accessing web service
This commit is contained in:
commit
1b0ef0ec0b
3 changed files with 7 additions and 1 deletions
|
@ -109,7 +109,7 @@ func handleUpdateTask(uuid string, user *models.User, username, reponame string,
|
||||||
}
|
}
|
||||||
|
|
||||||
// Ask for running deliver hook and test pull request tasks.
|
// Ask for running deliver hook and test pull request tasks.
|
||||||
reqURL := setting.AppUrl + username + "/" + reponame + "/tasks/trigger?branch=" +
|
reqURL := setting.LocalUrl + username + "/" + reponame + "/tasks/trigger?branch=" +
|
||||||
strings.TrimPrefix(task.RefName, "refs/heads/")
|
strings.TrimPrefix(task.RefName, "refs/heads/")
|
||||||
log.GitLogger.Trace("Trigger task: %s", reqURL)
|
log.GitLogger.Trace("Trigger task: %s", reqURL)
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,10 @@ DOMAIN = localhost
|
||||||
ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
|
ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
|
||||||
HTTP_ADDR =
|
HTTP_ADDR =
|
||||||
HTTP_PORT = 3000
|
HTTP_PORT = 3000
|
||||||
|
; Local (DMZ) URL for Gogs workers (such as SSH update) accessing web service.
|
||||||
|
; In most cases you do not need to change the default value.
|
||||||
|
; Alter it only if your SSH server node is not the same as HTTP node.
|
||||||
|
LOCAL_ROOT_URL = http://localhost:%(HTTP_PORT)s/
|
||||||
; Disable SSH feature when not available
|
; Disable SSH feature when not available
|
||||||
DISABLE_SSH = false
|
DISABLE_SSH = false
|
||||||
; Whether use builtin SSH server or not.
|
; Whether use builtin SSH server or not.
|
||||||
|
|
|
@ -59,6 +59,7 @@ var (
|
||||||
Protocol Scheme
|
Protocol Scheme
|
||||||
Domain string
|
Domain string
|
||||||
HttpAddr, HttpPort string
|
HttpAddr, HttpPort string
|
||||||
|
LocalUrl string
|
||||||
DisableSSH bool
|
DisableSSH bool
|
||||||
StartSSHServer bool
|
StartSSHServer bool
|
||||||
SSHDomain string
|
SSHDomain string
|
||||||
|
@ -300,6 +301,7 @@ func NewContext() {
|
||||||
Domain = sec.Key("DOMAIN").MustString("localhost")
|
Domain = sec.Key("DOMAIN").MustString("localhost")
|
||||||
HttpAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
|
HttpAddr = sec.Key("HTTP_ADDR").MustString("0.0.0.0")
|
||||||
HttpPort = sec.Key("HTTP_PORT").MustString("3000")
|
HttpPort = sec.Key("HTTP_PORT").MustString("3000")
|
||||||
|
LocalUrl = sec.Key("LOCAL_ROOT_URL").MustString("http://localhost:" + HttpPort + "/")
|
||||||
DisableSSH = sec.Key("DISABLE_SSH").MustBool()
|
DisableSSH = sec.Key("DISABLE_SSH").MustBool()
|
||||||
if !DisableSSH {
|
if !DisableSSH {
|
||||||
StartSSHServer = sec.Key("START_SSH_SERVER").MustBool()
|
StartSSHServer = sec.Key("START_SSH_SERVER").MustBool()
|
||||||
|
|
Loading…
Reference in a new issue