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
|
@ -108,8 +108,8 @@ func Migrate(ctx *context.APIContext) {
|
|||
|
||||
gitServiceType := convert.ToGitServiceType(form.Service)
|
||||
|
||||
if form.Mirror && setting.Repository.DisableMirrors {
|
||||
ctx.Error(http.StatusForbidden, "MirrorsGlobalDisabled", fmt.Errorf("the site administrator has disabled mirrors"))
|
||||
if form.Mirror && setting.Mirror.DisableNewPull {
|
||||
ctx.Error(http.StatusForbidden, "MirrorsGlobalDisabled", fmt.Errorf("the site administrator has disabled the creation of new pull mirrors"))
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -9,6 +9,7 @@ import (
|
|||
|
||||
"code.gitea.io/gitea/models"
|
||||
"code.gitea.io/gitea/modules/context"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
mirror_service "code.gitea.io/gitea/services/mirror"
|
||||
)
|
||||
|
||||
|
@ -42,6 +43,11 @@ func MirrorSync(ctx *context.APIContext) {
|
|||
ctx.Error(http.StatusForbidden, "MirrorSync", "Must have write access")
|
||||
}
|
||||
|
||||
if !setting.Mirror.Enabled {
|
||||
ctx.Error(http.StatusBadRequest, "MirrorSync", "Mirror feature is disabled")
|
||||
return
|
||||
}
|
||||
|
||||
mirror_service.StartToMirror(repo.ID)
|
||||
|
||||
ctx.Status(http.StatusOK)
|
||||
|
|
|
@ -58,7 +58,7 @@ func GetGeneralRepoSettings(ctx *context.APIContext) {
|
|||
// "200":
|
||||
// "$ref": "#/responses/GeneralRepoSettings"
|
||||
ctx.JSON(http.StatusOK, api.GeneralRepoSettings{
|
||||
MirrorsDisabled: setting.Repository.DisableMirrors,
|
||||
MirrorsDisabled: !setting.Mirror.Enabled,
|
||||
HTTPGitDisabled: setting.Repository.DisableHTTPGit,
|
||||
MigrationsDisabled: setting.Repository.DisableMigrations,
|
||||
StarsDisabled: setting.Repository.DisableStars,
|
||||
|
|
|
@ -141,7 +141,7 @@ func Home(ctx *context.Context) {
|
|||
ctx.Data["Members"] = members
|
||||
ctx.Data["Teams"] = org.Teams
|
||||
|
||||
ctx.Data["DisabledMirrors"] = setting.Repository.DisableMirrors
|
||||
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
|
||||
|
||||
pager := context.NewPagination(int(count), setting.UI.User.RepoPagingNum, page, 5)
|
||||
pager.SetDefaultParams(ctx)
|
||||
|
|
|
@ -152,9 +152,12 @@ func MigratePost(ctx *context.Context) {
|
|||
return
|
||||
}
|
||||
|
||||
serviceType := structs.GitServiceType(form.Service)
|
||||
if form.Mirror && setting.Mirror.DisableNewPull {
|
||||
ctx.Error(http.StatusBadRequest, "MigratePost: the site administrator has disabled creation of new mirrors")
|
||||
return
|
||||
}
|
||||
|
||||
setMigrationContextData(ctx, serviceType)
|
||||
setMigrationContextData(ctx, form.Service)
|
||||
|
||||
ctxUser := checkContextUser(ctx, form.UID)
|
||||
if ctx.Written() {
|
||||
|
@ -162,7 +165,7 @@ func MigratePost(ctx *context.Context) {
|
|||
}
|
||||
ctx.Data["ContextUser"] = ctxUser
|
||||
|
||||
tpl := base.TplName("repo/migrate/" + serviceType.Name())
|
||||
tpl := base.TplName("repo/migrate/" + form.Service.Name())
|
||||
|
||||
if ctx.HasError() {
|
||||
ctx.HTML(http.StatusOK, tpl)
|
||||
|
@ -198,12 +201,12 @@ func MigratePost(ctx *context.Context) {
|
|||
|
||||
var opts = migrations.MigrateOptions{
|
||||
OriginalURL: form.CloneAddr,
|
||||
GitServiceType: serviceType,
|
||||
GitServiceType: form.Service,
|
||||
CloneAddr: remoteAddr,
|
||||
RepoName: form.RepoName,
|
||||
Description: form.Description,
|
||||
Private: form.Private || setting.Repository.ForcePrivate,
|
||||
Mirror: form.Mirror && !setting.Repository.DisableMirrors,
|
||||
Mirror: form.Mirror,
|
||||
LFS: form.LFS,
|
||||
LFSEndpoint: form.LFSEndpoint,
|
||||
AuthUsername: form.AuthUsername,
|
||||
|
@ -246,7 +249,7 @@ func setMigrationContextData(ctx *context.Context, serviceType structs.GitServic
|
|||
|
||||
ctx.Data["LFSActive"] = setting.LFS.StartServer
|
||||
ctx.Data["IsForcedPrivate"] = setting.Repository.ForcePrivate
|
||||
ctx.Data["DisableMirrors"] = setting.Repository.DisableMirrors
|
||||
ctx.Data["DisableNewPullMirrors"] = setting.Mirror.DisableNewPull
|
||||
|
||||
// Plain git should be first
|
||||
ctx.Data["Services"] = append([]structs.GitServiceType{structs.PlainGitService}, structs.SupportedFullGitService...)
|
||||
|
|
|
@ -52,7 +52,8 @@ func Settings(ctx *context.Context) {
|
|||
ctx.Data["Title"] = ctx.Tr("repo.settings")
|
||||
ctx.Data["PageIsSettingsOptions"] = true
|
||||
ctx.Data["ForcePrivate"] = setting.Repository.ForcePrivate
|
||||
ctx.Data["DisabledMirrors"] = setting.Repository.DisableMirrors
|
||||
ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled
|
||||
ctx.Data["DisableNewPushMirrors"] = setting.Mirror.DisableNewPush
|
||||
ctx.Data["DefaultMirrorInterval"] = setting.Mirror.DefaultInterval
|
||||
|
||||
signing, _ := models.SigningKey(ctx.Repo.Repository.RepoPath())
|
||||
|
@ -144,7 +145,7 @@ func SettingsPost(ctx *context.Context) {
|
|||
ctx.Redirect(repo.Link() + "/settings")
|
||||
|
||||
case "mirror":
|
||||
if !repo.IsMirror {
|
||||
if !setting.Mirror.Enabled || !repo.IsMirror {
|
||||
ctx.NotFound("", nil)
|
||||
return
|
||||
}
|
||||
|
@ -220,7 +221,7 @@ func SettingsPost(ctx *context.Context) {
|
|||
ctx.Redirect(repo.Link() + "/settings")
|
||||
|
||||
case "mirror-sync":
|
||||
if !repo.IsMirror {
|
||||
if !setting.Mirror.Enabled || !repo.IsMirror {
|
||||
ctx.NotFound("", nil)
|
||||
return
|
||||
}
|
||||
|
@ -231,6 +232,11 @@ func SettingsPost(ctx *context.Context) {
|
|||
ctx.Redirect(repo.Link() + "/settings")
|
||||
|
||||
case "push-mirror-sync":
|
||||
if !setting.Mirror.Enabled {
|
||||
ctx.NotFound("", nil)
|
||||
return
|
||||
}
|
||||
|
||||
m, err := selectPushMirrorByForm(form, repo)
|
||||
if err != nil {
|
||||
ctx.NotFound("", nil)
|
||||
|
@ -243,6 +249,11 @@ func SettingsPost(ctx *context.Context) {
|
|||
ctx.Redirect(repo.Link() + "/settings")
|
||||
|
||||
case "push-mirror-remove":
|
||||
if !setting.Mirror.Enabled {
|
||||
ctx.NotFound("", nil)
|
||||
return
|
||||
}
|
||||
|
||||
// This section doesn't require repo_name/RepoName to be set in the form, don't show it
|
||||
// as an error on the UI for this action
|
||||
ctx.Data["Err_RepoName"] = nil
|
||||
|
@ -267,6 +278,11 @@ func SettingsPost(ctx *context.Context) {
|
|||
ctx.Redirect(repo.Link() + "/settings")
|
||||
|
||||
case "push-mirror-add":
|
||||
if setting.Mirror.DisableNewPush {
|
||||
ctx.NotFound("", nil)
|
||||
return
|
||||
}
|
||||
|
||||
// This section doesn't require repo_name/RepoName to be set in the form, don't show it
|
||||
// as an error on the UI for this action
|
||||
ctx.Data["Err_RepoName"] = nil
|
||||
|
@ -698,6 +714,7 @@ func SettingsPost(ctx *context.Context) {
|
|||
|
||||
log.Trace("Repository was archived: %s/%s", ctx.Repo.Owner.Name, repo.Name)
|
||||
ctx.Redirect(ctx.Repo.RepoLink + "/settings")
|
||||
|
||||
case "unarchive":
|
||||
if !ctx.Repo.IsOwner() {
|
||||
ctx.Error(http.StatusForbidden)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue