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 <me@silverwind.io> * Update docs/content/doc/advanced/config-cheat-sheet.en-us.md Co-authored-by: silverwind <me@silverwind.io> * 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 <me@silverwind.io>
This commit is contained in:
parent
867b34d5e9
commit
14d96ff7ac
7 changed files with 12 additions and 11 deletions
|
@ -2091,7 +2091,7 @@ PATH =
|
||||||
;[mirror]
|
;[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
|
;ENABLED = true
|
||||||
;; Disable the creation of **new** pull mirrors. Pre-existing mirrors remain valid. Will be ignored if `mirror.ENABLED` is `false`.
|
;; Disable the creation of **new** pull mirrors. Pre-existing mirrors remain valid. Will be ignored if `mirror.ENABLED` is `false`.
|
||||||
;DISABLE_NEW_PULL = false
|
;DISABLE_NEW_PULL = false
|
||||||
|
|
|
@ -1095,7 +1095,7 @@ Task queue configuration has been moved to `queue.task`. However, the below conf
|
||||||
|
|
||||||
## Mirror (`mirror`)
|
## 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_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`.
|
- `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
|
- `DEFAULT_INTERVAL`: **8h**: Default interval between each check
|
||||||
|
|
|
@ -930,7 +930,6 @@ need_auth = Authorization
|
||||||
migrate_options = Migration Options
|
migrate_options = Migration Options
|
||||||
migrate_service = Migration Service
|
migrate_service = Migration Service
|
||||||
migrate_options_mirror_helper = This repository will be a <span class="text blue">mirror</span>
|
migrate_options_mirror_helper = This repository will be a <span class="text blue">mirror</span>
|
||||||
migrate_options_mirror_disabled = Your site administrator has disabled new mirrors.
|
|
||||||
migrate_options_lfs = Migrate LFS files
|
migrate_options_lfs = Migrate LFS files
|
||||||
migrate_options_lfs_endpoint.label = LFS Endpoint
|
migrate_options_lfs_endpoint.label = LFS Endpoint
|
||||||
migrate_options_lfs_endpoint.description = Migration will attempt to use your Git remote to <a target="_blank" rel="noopener noreferrer" href="%s">determine the LFS server</a>. You can also specify a custom endpoint if the repository LFS data is stored somewhere else.
|
migrate_options_lfs_endpoint.description = Migration will attempt to use your Git remote to <a target="_blank" rel="noopener noreferrer" href="%s">determine the LFS server</a>. You can also specify a custom endpoint if the repository LFS data is stored somewhere else.
|
||||||
|
|
|
@ -78,6 +78,7 @@ func Dashboard(ctx *context.Context) {
|
||||||
ctx.Data["PageIsNews"] = true
|
ctx.Data["PageIsNews"] = true
|
||||||
cnt, _ := organization.GetOrganizationCount(ctx, ctxUser)
|
cnt, _ := organization.GetOrganizationCount(ctx, ctxUser)
|
||||||
ctx.Data["UserOrgsCount"] = cnt
|
ctx.Data["UserOrgsCount"] = cnt
|
||||||
|
ctx.Data["MirrorsEnabled"] = setting.Mirror.Enabled
|
||||||
|
|
||||||
var uid int64
|
var uid int64
|
||||||
if ctxUser != nil {
|
if ctxUser != nil {
|
||||||
|
|
|
@ -155,7 +155,9 @@ func registerCleanupPackages() {
|
||||||
}
|
}
|
||||||
|
|
||||||
func initBasicTasks() {
|
func initBasicTasks() {
|
||||||
|
if setting.Mirror.Enabled {
|
||||||
registerUpdateMirrorTask()
|
registerUpdateMirrorTask()
|
||||||
|
}
|
||||||
registerRepoHealthCheck()
|
registerRepoHealthCheck()
|
||||||
registerCheckRepoStats()
|
registerCheckRepoStats()
|
||||||
registerArchiveCleanup()
|
registerArchiveCleanup()
|
||||||
|
|
|
@ -1,15 +1,12 @@
|
||||||
|
{{if not .DisableNewPullMirrors}}
|
||||||
<div class="inline field">
|
<div class="inline field">
|
||||||
<label>{{.i18n.Tr "repo.migrate_options"}}</label>
|
<label>{{.i18n.Tr "repo.migrate_options"}}</label>
|
||||||
<div class="ui checkbox">
|
<div class="ui checkbox">
|
||||||
{{if .DisableNewPullMirrors}}
|
|
||||||
<input id="mirror" name="mirror" type="checkbox" readonly>
|
|
||||||
<label>{{.i18n.Tr "repo.migrate_options_mirror_disabled"}}</label>
|
|
||||||
{{else}}
|
|
||||||
<input id="mirror" name="mirror" type="checkbox" {{if .mirror}} checked{{end}}>
|
<input id="mirror" name="mirror" type="checkbox" {{if .mirror}} checked{{end}}>
|
||||||
<label>{{.i18n.Tr "repo.migrate_options_mirror_helper" | Safe}}</label>
|
<label>{{.i18n.Tr "repo.migrate_options_mirror_helper" | Safe}}</label>
|
||||||
{{end}}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{{end}}
|
||||||
{{if .LFSActive}}
|
{{if .LFSActive}}
|
||||||
<div class="inline field">
|
<div class="inline field">
|
||||||
<label></label>
|
<label></label>
|
||||||
|
|
|
@ -109,10 +109,12 @@
|
||||||
{{.i18n.Tr "forks"}}
|
{{.i18n.Tr "forks"}}
|
||||||
<div v-show="reposFilter === 'forks'" class="ui circular mini grey label">${repoTypeCount}</div>
|
<div v-show="reposFilter === 'forks'" class="ui circular mini grey label">${repoTypeCount}</div>
|
||||||
</a>
|
</a>
|
||||||
|
{{if .MirrorsEnabled}}
|
||||||
<a class="item" :class="{active: reposFilter === 'mirrors'}" @click="changeReposFilter('mirrors')">
|
<a class="item" :class="{active: reposFilter === 'mirrors'}" @click="changeReposFilter('mirrors')">
|
||||||
{{.i18n.Tr "mirrors"}}
|
{{.i18n.Tr "mirrors"}}
|
||||||
<div v-show="reposFilter === 'mirrors'" class="ui circular mini grey label">${repoTypeCount}</div>
|
<div v-show="reposFilter === 'mirrors'" class="ui circular mini grey label">${repoTypeCount}</div>
|
||||||
</a>
|
</a>
|
||||||
|
{{end}}
|
||||||
<a class="item" :class="{active: reposFilter === 'collaborative'}" @click="changeReposFilter('collaborative')">
|
<a class="item" :class="{active: reposFilter === 'collaborative'}" @click="changeReposFilter('collaborative')">
|
||||||
{{.i18n.Tr "collaborative"}}
|
{{.i18n.Tr "collaborative"}}
|
||||||
<div v-show="reposFilter === 'collaborative'" class="ui circular mini grey label">${repoTypeCount}</div>
|
<div v-show="reposFilter === 'collaborative'" class="ui circular mini grey label">${repoTypeCount}</div>
|
||||||
|
|
Reference in a new issue