mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-21 22:08:37 -04:00
Add proxy settings and support for migration and webhook (#16704)
* Add proxy settings and support for migration and webhook * Fix default value * Add newline for example ini * Add lfs proxy support * Fix lint * Follow @zeripath's review * Fix git clone * Fix test * missgin http requests for proxy * use empty Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
parent
422c30d315
commit
f9acad82ca
20 changed files with 302 additions and 41 deletions
|
@ -16,6 +16,7 @@ var (
|
|||
AllowedDomains []string
|
||||
BlockedDomains []string
|
||||
AllowLocalNetworks bool
|
||||
SkipTLSVerify bool
|
||||
}{
|
||||
MaxAttempts: 3,
|
||||
RetryBackoff: 3,
|
||||
|
@ -37,4 +38,5 @@ func newMigrationsService() {
|
|||
}
|
||||
|
||||
Migrations.AllowLocalNetworks = sec.Key("ALLOW_LOCALNETWORKS").MustBool(false)
|
||||
Migrations.SkipTLSVerify = sec.Key("SKIP_TLS_VERIFY").MustBool(false)
|
||||
}
|
||||
|
|
40
modules/setting/proxy.go
Normal file
40
modules/setting/proxy.go
Normal file
|
@ -0,0 +1,40 @@
|
|||
// Copyright 2021 The Gitea Authors. All rights reserved.
|
||||
// Use of this source code is governed by a MIT-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package setting
|
||||
|
||||
import (
|
||||
"net/url"
|
||||
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
)
|
||||
|
||||
var (
|
||||
// Proxy settings
|
||||
Proxy = struct {
|
||||
Enabled bool
|
||||
ProxyURL string
|
||||
ProxyURLFixed *url.URL
|
||||
ProxyHosts []string
|
||||
}{
|
||||
Enabled: false,
|
||||
ProxyURL: "",
|
||||
ProxyHosts: []string{},
|
||||
}
|
||||
)
|
||||
|
||||
func newProxyService() {
|
||||
sec := Cfg.Section("proxy")
|
||||
Proxy.Enabled = sec.Key("PROXY_ENABLED").MustBool(false)
|
||||
Proxy.ProxyURL = sec.Key("PROXY_URL").MustString("")
|
||||
if Proxy.ProxyURL != "" {
|
||||
var err error
|
||||
Proxy.ProxyURLFixed, err = url.Parse(Proxy.ProxyURL)
|
||||
if err != nil {
|
||||
log.Error("Global PROXY_URL is not valid")
|
||||
Proxy.ProxyURL = ""
|
||||
}
|
||||
}
|
||||
Proxy.ProxyHosts = sec.Key("PROXY_HOSTS").Strings(",")
|
||||
}
|
|
@ -1195,6 +1195,7 @@ func NewServices() {
|
|||
newMailService()
|
||||
newRegisterMailService()
|
||||
newNotifyMailService()
|
||||
newProxyService()
|
||||
newWebhookService()
|
||||
newMigrationsService()
|
||||
newIndexerService()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue