diff options
| author | KN4CK3R | 2022-03-02 23:50:29 +0100 |
|---|---|---|
| committer | GitHub | 2022-03-02 23:50:29 +0100 |
| commit | f3cbdee38e5111886a8ab0855be615ba180c45dc (patch) | |
| tree | a33fa928fc66a1151db66346d026ec0e62dd4731 | |
| parent | efd10f1ab4bd66ef8e583ff8f9d3d25f7f741a6a (diff) | |
Don't clean up hardcoded `tmp` (#18983)
* Don't clean up hardcoded `tmp`.
* Fixed import.
| -rw-r--r-- | custom/conf/app.example.ini | 4 | ||||
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 4 | ||||
| -rw-r--r-- | models/repo.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index a48c41909..42d175671 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -890,7 +890,7 @@ PATH = ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; -;; Path for local repository copy. Defaults to `tmp/local-repo` +;; Path for local repository copy. Defaults to `tmp/local-repo` (content gets deleted on gitea restart) ;LOCAL_COPY_PATH = tmp/local-repo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -902,7 +902,7 @@ PATH = ;; Whether repository file uploads are enabled. Defaults to `true` ;ENABLED = true ;; -;; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart) +;; Path for uploads. Defaults to `data/tmp/uploads` (content gets deleted on gitea restart) ;TEMP_PATH = data/tmp/uploads ;; ;; Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types. 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 6c2908339..59b8fc31f 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -107,7 +107,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. ### Repository - Upload (`repository.upload`) - `ENABLED`: **true**: Whether repository file uploads are enabled -- `TEMP_PATH`: **data/tmp/uploads**: Path for uploads (tmp gets deleted on Gitea restart) +- `TEMP_PATH`: **data/tmp/uploads**: Path for uploads (content gets deleted on Gitea restart) - `ALLOWED_TYPES`: **\<empty\>**: Comma-separated list of allowed file extensions (`.zip`), mime types (`text/plain`) or wildcard type (`image/*`, `audio/*`, `video/*`). Empty value or `*/*` allows all types. - `FILE_MAX_SIZE`: **3**: Max size of each file in megabytes. - `MAX_FILES`: **5**: Max number of files per upload @@ -144,7 +144,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`. ## Repository - Local (`repository.local`) -- `LOCAL_COPY_PATH`: **tmp/local-repo**: Path for temporary local repository copies. Defaults to `tmp/local-repo` +- `LOCAL_COPY_PATH`: **tmp/local-repo**: Path for temporary local repository copies. Defaults to `tmp/local-repo` (content gets deleted on Gitea restart) ## Repository - MIME type mapping (`repository.mimetype_mapping`) diff --git a/models/repo.go b/models/repo.go index 02e1a3325..821b60d08 100644 --- a/models/repo.go +++ b/models/repo.go @@ -10,7 +10,6 @@ import ( "fmt" "os" "path" - "path/filepath" "sort" "strconv" "strings" @@ -123,7 +122,8 @@ func NewRepoContext() { loadRepoConfig() unit.LoadUnitConfig() - admin_model.RemoveAllWithNotice(db.DefaultContext, "Clean up repository temporary data", filepath.Join(setting.AppDataPath, "tmp")) + admin_model.RemoveAllWithNotice(db.DefaultContext, "Clean up temporary repository uploads", setting.Repository.Upload.TempPath) + admin_model.RemoveAllWithNotice(db.DefaultContext, "Clean up temporary repositories", LocalCopyPath()) } // CheckRepoUnitUser check whether user could visit the unit of this repository |