forked from forgejo/forgejo
Make mirror feature more configurable (#16957)
Rename`[repository]` `DISABLE_MIRRORS` to `[mirror]` `DISABLE_NEW_PULL` and add `ENABLED` and `DISABLE_NEW_PUSH` with the below meanings: - `ENABLED`: **true**: Enables the mirror functionality. Set to **false** to disable all mirrors. - `DISABLE_NEW_PULL`: **false**: Disable the creation of **new** mirrors. Pre-existing mirrors remain valid. - `DISABLE_NEW_PUSH`: **false**: Disable the creation of **new** push mirrors. Pre-existing mirrors remain valid. Co-authored-by: zeripath <art27@cantab.net> Co-authored-by: delvh <dev.lh@web.de>
This commit is contained in:
parent
ded438fb1a
commit
63d7cbcef1
16 changed files with 162 additions and 75 deletions
59
modules/setting/mirror.go
Normal file
59
modules/setting/mirror.go
Normal file
|
@ -0,0 +1,59 @@
|
|||
// 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 (
|
||||
"time"
|
||||
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
)
|
||||
|
||||
var (
|
||||
// Mirror settings
|
||||
Mirror = struct {
|
||||
Enabled bool
|
||||
DisableNewPull bool
|
||||
DisableNewPush bool
|
||||
DefaultInterval time.Duration
|
||||
MinInterval time.Duration
|
||||
}{
|
||||
Enabled: true,
|
||||
DisableNewPull: false,
|
||||
DisableNewPush: false,
|
||||
MinInterval: 10 * time.Minute,
|
||||
DefaultInterval: 8 * time.Hour,
|
||||
}
|
||||
)
|
||||
|
||||
func newMirror() {
|
||||
// Handle old configuration through `[repository]` `DISABLE_MIRRORS`
|
||||
// - please note this was badly named and only disabled the creation of new pull mirrors
|
||||
if Cfg.Section("repository").Key("DISABLE_MIRRORS").MustBool(false) {
|
||||
log.Warn("Deprecated DISABLE_MIRRORS config is used, please change your config and use the options within the [mirror] section")
|
||||
// TODO: enable on v1.17.0: log.Error("Deprecated fallback used, will be removed in v1.18.0")
|
||||
Mirror.DisableNewPull = true
|
||||
}
|
||||
if err := Cfg.Section("mirror").MapTo(&Mirror); err != nil {
|
||||
log.Fatal("Failed to map Mirror settings: %v", err)
|
||||
}
|
||||
|
||||
if !Mirror.Enabled {
|
||||
Mirror.DisableNewPull = true
|
||||
Mirror.DisableNewPush = true
|
||||
}
|
||||
|
||||
if Mirror.MinInterval.Minutes() < 1 {
|
||||
log.Warn("Mirror.MinInterval is too low, set to 1 minute")
|
||||
Mirror.MinInterval = 1 * time.Minute
|
||||
}
|
||||
if Mirror.DefaultInterval < Mirror.MinInterval {
|
||||
if time.Hour*8 < Mirror.MinInterval {
|
||||
Mirror.DefaultInterval = Mirror.MinInterval
|
||||
} else {
|
||||
Mirror.DefaultInterval = time.Hour * 8
|
||||
}
|
||||
log.Warn("Mirror.DefaultInterval is less than Mirror.MinInterval, set to %s", Mirror.DefaultInterval.String())
|
||||
}
|
||||
}
|
|
@ -41,7 +41,6 @@ var (
|
|||
DisabledRepoUnits []string
|
||||
DefaultRepoUnits []string
|
||||
PrefixArchiveFiles bool
|
||||
DisableMirrors bool
|
||||
DisableMigrations bool
|
||||
DisableStars bool `ini:"DISABLE_STARS"`
|
||||
DefaultBranch string
|
||||
|
@ -155,7 +154,6 @@ var (
|
|||
DisabledRepoUnits: []string{},
|
||||
DefaultRepoUnits: []string{},
|
||||
PrefixArchiveFiles: true,
|
||||
DisableMirrors: false,
|
||||
DisableMigrations: false,
|
||||
DisableStars: false,
|
||||
DefaultBranch: "master",
|
||||
|
|
|
@ -348,12 +348,6 @@ var (
|
|||
|
||||
ManifestData string
|
||||
|
||||
// Mirror settings
|
||||
Mirror struct {
|
||||
DefaultInterval time.Duration
|
||||
MinInterval time.Duration
|
||||
}
|
||||
|
||||
// API settings
|
||||
API = struct {
|
||||
EnableSwagger bool
|
||||
|
@ -938,17 +932,7 @@ func NewContext() {
|
|||
|
||||
newGit()
|
||||
|
||||
sec = Cfg.Section("mirror")
|
||||
Mirror.MinInterval = sec.Key("MIN_INTERVAL").MustDuration(10 * time.Minute)
|
||||
Mirror.DefaultInterval = sec.Key("DEFAULT_INTERVAL").MustDuration(8 * time.Hour)
|
||||
if Mirror.MinInterval.Minutes() < 1 {
|
||||
log.Warn("Mirror.MinInterval is too low")
|
||||
Mirror.MinInterval = 1 * time.Minute
|
||||
}
|
||||
if Mirror.DefaultInterval < Mirror.MinInterval {
|
||||
log.Warn("Mirror.DefaultInterval is less than Mirror.MinInterval")
|
||||
Mirror.DefaultInterval = time.Hour * 8
|
||||
}
|
||||
newMirror()
|
||||
|
||||
Langs = Cfg.Section("i18n").Key("LANGS").Strings(",")
|
||||
if len(Langs) == 0 {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue