From 423d98a77f9ccb286e1eeacf0acf2c53d77bd820 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20=22BKC=22=20Carlb=C3=A4cker?= Date: Tue, 10 Jul 2018 07:25:41 +0200 Subject: [PATCH] Update app.ini.sample. Fix improper error message --- custom/conf/app.ini.sample | 4 ++++ modules/setting/setting.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/custom/conf/app.ini.sample b/custom/conf/app.ini.sample index c4dd741ca..530413211 100644 --- a/custom/conf/app.ini.sample +++ b/custom/conf/app.ini.sample @@ -249,6 +249,10 @@ MIN_PASSWORD_LENGTH = 6 IMPORT_LOCAL_PATHS = false ; Prevent all users (including admin) from creating custom git hooks 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] ; diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 984d07a88..ef291595d 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -1206,7 +1206,7 @@ func loadOrGenerateInternalToken(sec *ini.Section) string { log.Fatal(4, "Failed to create '%s': %v", CustomConf, err) } 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