diff options
author | Lauris BH <lauris@nix.lv> | 2017-08-03 18:32:13 +0300 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-08-03 23:32:13 +0800 |
commit | fa8d40facab6d3cba0bd95a3c882edfc28d478fd (patch) | |
tree | bd87049ff38735a078b4536cdb36ea707ee0c5e4 /modules/setting/setting.go | |
parent | a4ca54425f873d30e8afc323f86625e1980aa066 (diff) | |
download | gitea-fa8d40facab6d3cba0bd95a3c882edfc28d478fd.tar.gz gitea-fa8d40facab6d3cba0bd95a3c882edfc28d478fd.zip |
Fix internal requests when gitea listens to unix socket or only external IP (#2234)
* Fix internal requests when gitea listens to unix socket or only external IP
* When Gitea is set to listen using FastCGI use AppURL for LocalURL
Diffstat (limited to 'modules/setting/setting.go')
-rw-r--r-- | modules/setting/setting.go | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 5bd2495287..8cd9fa6086 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -658,7 +658,22 @@ func NewContext() { AppSubURL = strings.TrimSuffix(url.Path, "/") AppSubURLDepth = strings.Count(AppSubURL, "/") - LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(string(Protocol) + "://localhost:" + HTTPPort + "/") + var defaultLocalURL string + switch Protocol { + case UnixSocket: + defaultLocalURL = "http://unix/" + case FCGI: + defaultLocalURL = AppURL + default: + defaultLocalURL = string(Protocol) + "://" + if HTTPAddr == "0.0.0.0" { + defaultLocalURL += "localhost" + } else { + defaultLocalURL += HTTPAddr + } + defaultLocalURL += ":" + HTTPPort + "/" + } + LocalURL = sec.Key("LOCAL_ROOT_URL").MustString(defaultLocalURL) OfflineMode = sec.Key("OFFLINE_MODE").MustBool() DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool() StaticRootPath = sec.Key("STATIC_ROOT_PATH").MustString(workDir) |