peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update app.ini.sample. Fix improper error message

Browse Source
This commit is contained in:
Kim "BKC" Carlbäcker 2018-07-10 07:25:41 +02:00
parent 4cec5ff078
commit 423d98a77f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
custom/conf/app.ini.sample
View File

@ -249,6 +249,10 @@ MIN_PASSWORD_LENGTH = 6
IMPORT_LOCAL_PATHS = false IMPORT_LOCAL_PATHS = false
; Prevent all users (including admin) from creating custom git hooks ; Prevent all users (including admin) from creating custom git hooks
DISABLE_GIT_HOOKS = false DISABLE_GIT_HOOKS = false
; Store INTERNAL_TOKEN in a separate file. Will be stored in this config if not set
; formats allowed:
; - file:/path/to/my/internal_token
;INTERNAL_TOKEN_URI =
[openid] [openid]
; ;

2
modules/setting/setting.go
View File

@ -1206,7 +1206,7 @@ func loadOrGenerateInternalToken(sec *ini.Section) string {
log.Fatal(4, "Failed to create '%s': %v", CustomConf, err) log.Fatal(4, "Failed to create '%s': %v", CustomConf, err)
} }
if err := cfgSave.SaveTo(CustomConf); err != nil { if err := cfgSave.SaveTo(CustomConf); err != nil {
log.Fatal(4, "Error saving generated JWT Secret to custom config: %v", err) log.Fatal(4, "Error saving generated INTERNAL_TOKEN to custom config: %v", err)
} }
} }
return token return token