From 14d96ff7acacf8912b05f113b8ca35f67edebd1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bogus=C5=82awski?= Date: Sat, 4 Jun 2022 13:42:17 +0200 Subject: [PATCH] Disable unnecessary mirroring elements (#18527) * Disable unnecessary mirroring elements This mod fixes disabling unnecessary mirroring elements. Related: https://github.com/go-gitea/gitea/pull/16957 Related: https://github.com/go-gitea/gitea/pull/13084 Author-Change-Id: IB#1105104 * Checkbox rendering disabled instead of hiding it Fixes: 02b45051503d4330da9757ff084c9cc5e6e60d84 Related: https://github.com/go-gitea/gitea/pull/18527#pullrequestreview-878061913 Author-Change-Id: IB#1105104 * Update custom/conf/app.example.ini Co-authored-by: silverwind * Update docs/content/doc/advanced/config-cheat-sheet.en-us.md Co-authored-by: silverwind * Mirror filter removed only when whole mirroring feature is disabled Fixes: 02b45051503d4330da9757ff084c9cc5e6e60d84 Related: https://github.com/go-gitea/gitea/pull/18527#discussion_r883268890 Author-Change-Id: IB#1105104 Co-authored-by: silverwind --- custom/conf/app.example.ini | 2 +- docs/content/doc/advanced/config-cheat-sheet.en-us.md | 2 +- options/locale/locale_en-US.ini | 1 - routers/web/user/home.go | 1 + services/cron/tasks_basic.go | 4 +++- templates/repo/migrate/options.tmpl | 11 ++++------- templates/user/dashboard/repolist.tmpl | 2 ++ 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 9a5056476..5814c0d69 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -2091,7 +2091,7 @@ PATH = ;[mirror] ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Enables the mirror functionality. Set to **false** to disable all mirrors. +;; Enables the mirror functionality. Set to **false** to disable all mirrors. Pre-existing mirrors remain valid but won't be updated; may be converted to regular repo. ;ENABLED = true ;; Disable the creation of **new** pull mirrors. Pre-existing mirrors remain valid. Will be ignored if `mirror.ENABLED` is `false`. ;DISABLE_NEW_PULL = false diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 2dae3526f..edd23012f 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -1095,7 +1095,7 @@ Task queue configuration has been moved to `queue.task`. However, the below conf ## Mirror (`mirror`) -- `ENABLED`: **true**: Enables the mirror functionality. Set to **false** to disable all mirrors. +- `ENABLED`: **true**: Enables the mirror functionality. Set to **false** to disable all mirrors. Pre-existing mirrors remain valid but won't be updated; may be converted to regular repo. - `DISABLE_NEW_PULL`: **false**: Disable the creation of **new** pull mirrors. Pre-existing mirrors remain valid. Will be ignored if `mirror.ENABLED` is `false`. - `DISABLE_NEW_PUSH`: **false**: Disable the creation of **new** push mirrors. Pre-existing mirrors remain valid. Will be ignored if `mirror.ENABLED` is `false`. - `DEFAULT_INTERVAL`: **8h**: Default interval between each check diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 66dad56fd..5dfe92900 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -930,7 +930,6 @@ need_auth = Authorization migrate_options = Migration Options migrate_service = Migration Service migrate_options_mirror_helper = This repository will be a mirror -migrate_options_mirror_disabled = Your site administrator has disabled new mirrors. migrate_options_lfs = Migrate LFS files migrate_options_lfs_endpoint.label = LFS Endpoint migrate_options_lfs_endpoint.description = Migration will attempt to use your Git remote to determine the LFS server. You can also specify a custom endpoint if the repository LFS data is stored somewhere else. diff --git a/routers/web/user/home.go b/routers/web/user/home.go index 2a802053f..455761d03 100644 --- a/routers/web/user/home.go +++ b/routers/web/user/home.go @@ -78,6 +78,7 @@ func Dashboard(ctx *context.Context) { ctx.Data["PageIsNews"] = true cnt, _ := organization.GetOrganizationCount(ctx, ctxUser) ctx.Data["UserOrgsCount"] = cnt + ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled var uid int64 if ctxUser != nil { diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go index 6f3fcb42c..39fda34ea 100644 --- a/services/cron/tasks_basic.go +++ b/services/cron/tasks_basic.go @@ -155,7 +155,9 @@ func registerCleanupPackages() { } func initBasicTasks() { - registerUpdateMirrorTask() + if setting.Mirror.Enabled { + registerUpdateMirrorTask() + } registerRepoHealthCheck() registerCheckRepoStats() registerArchiveCleanup() diff --git a/templates/repo/migrate/options.tmpl b/templates/repo/migrate/options.tmpl index 8aefaf68f..bb2a6ed77 100644 --- a/templates/repo/migrate/options.tmpl +++ b/templates/repo/migrate/options.tmpl @@ -1,15 +1,12 @@ +{{if not .DisableNewPullMirrors}}
- {{if .DisableNewPullMirrors}} - - - {{else}} - - - {{end}} + +
+{{end}} {{if .LFSActive}}
diff --git a/templates/user/dashboard/repolist.tmpl b/templates/user/dashboard/repolist.tmpl index 41230d328..b2f936402 100644 --- a/templates/user/dashboard/repolist.tmpl +++ b/templates/user/dashboard/repolist.tmpl @@ -109,10 +109,12 @@ {{.i18n.Tr "forks"}}
${repoTypeCount}
+ {{if .MirrorsEnabled}} {{.i18n.Tr "mirrors"}}
${repoTypeCount}
 + {{end}} {{.i18n.Tr "collaborative"}}
${repoTypeCount}