aboutsummaryrefslogtreecommitdiff
path: root/custom
diff options
context:
space:
mode:
authorAnthony Wang2022-10-18 18:25:01 +0000
committerAnthony Wang2022-10-18 18:25:01 +0000
commite78dd699de4a182d66b5582ef00e6749b3e33011 (patch)
tree6917b92280b376ff35da1fe6eaf09baeab1ac43e /custom
parentcbc2a970be56ddcb50a3d59a94b3465aba3169e5 (diff)
parent0614ae1c446e6a4ddaed4cca5a43ce7a2003d890 (diff)
Merge remote-tracking branch 'upstream/main'
Diffstat (limited to 'custom')
-rw-r--r--custom/conf/app.example.ini13
1 files changed, 9 insertions, 4 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 4a1a3738d..c6feae8f5 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -379,14 +379,19 @@ LOG_SQL = false ; if unset defaults to true
;; Whether the installer is disabled (set to true to disable the installer)
INSTALL_LOCK = false
;;
-;; Global secret key that will be used - if blank will be regenerated.
+;; Global secret key that will be used
+;; This key is VERY IMPORTANT. If you lose it, the data encrypted by it (like 2FA secret) can't be decrypted anymore.
SECRET_KEY =
;;
+;; Alternative location to specify secret key, instead of this file; you cannot specify both this and SECRET_KEY, and must pick one
+;; This key is VERY IMPORTANT. If you lose it, the data encrypted by it (like 2FA secret) can't be decrypted anymore.
+;SECRET_KEY_URI = file:/etc/gitea/secret_key
+;;
;; Secret used to validate communication within Gitea binary.
INTERNAL_TOKEN=
;;
-;; Instead of defining internal token in the configuration, this configuration option can be used to give Gitea a path to a file that contains the internal token (example value: file:/etc/gitea/internal_token)
-;INTERNAL_TOKEN_URI = ;e.g. /etc/gitea/internal_token
+;; Alternative location to specify internal token, instead of this file; you cannot specify both this and INTERNAL_TOKEN, and must pick one
+;INTERNAL_TOKEN_URI = file:/etc/gitea/internal_token
;;
;; How long to remember that a user is logged in before requiring relogin (in days)
;LOGIN_REMEMBER_DAYS = 7
@@ -882,7 +887,7 @@ ROUTER = console
;USE_COMPAT_SSH_URI = false
;;
;; Close issues as long as a commit on any branch marks it as fixed
-;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki
+;; Comma separated list of globally disabled repo units. Allowed values: repo.issues, repo.ext_issues, repo.pulls, repo.wiki, repo.ext_wiki, repo.projects
;DISABLED_REPO_UNITS =
;;
;; Comma separated list of default repo units. Allowed values: repo.code, repo.releases, repo.issues, repo.pulls, repo.wiki, repo.projects.