diff options
| author | 6543 <6543@obermui.de> | 2021-09-07 17:49:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-07 17:49:36 +0200 |
| commit | 63d7cbcef13b4eb719a5749a1a79361461c77135 (patch) | |
| tree | 55f50695a9cdd31b33eccb5fac766dbaa78cd6ab /routers/web/repo/migrate.go | |
| parent | ded438fb1a320b2f4741e5efbd9a5b3d5e3ad0c7 (diff) | |
| download | gitea-63d7cbcef13b4eb719a5749a1a79361461c77135.tar.gz gitea-63d7cbcef13b4eb719a5749a1a79361461c77135.zip | |
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>
Diffstat (limited to 'routers/web/repo/migrate.go')
| -rw-r--r-- | routers/web/repo/migrate.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/routers/web/repo/migrate.go b/routers/web/repo/migrate.go index 3d710d0448..b2e6fa890b 100644 --- a/routers/web/repo/migrate.go +++ b/routers/web/repo/migrate.go @@ -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...) |