From 042cac5fedeec8af53080b9666fe043072f3a6be Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Wed, 1 Dec 2021 15:50:01 +0800 Subject: Improve install code to avoid low-level mistakes. (#17779) * Improve install code to avoid low-level mistakes. If a user tries to do a re-install in a Gitea database, they gets a warning and double check. When Gitea runs, it never create empty app.ini automatically. Also some small (related) refactoring: * Refactor db.InitEngine related logic make it more clean (especially for the install code) * Move some i18n strings out from setting.go to make the setting.go can be easily maintained. * Show errors in CLI code if an incorrect app.ini is used. * APP_DATA_PATH is created when installing, and checked when starting (no empty directory is created any more). --- modules/private/internal.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'modules/private/internal.go') diff --git a/modules/private/internal.go b/modules/private/internal.go index f5b5db0ca1..0a39ca7b8e 100644 --- a/modules/private/internal.go +++ b/modules/private/internal.go @@ -13,14 +13,18 @@ import ( "code.gitea.io/gitea/modules/httplib" "code.gitea.io/gitea/modules/json" + "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/setting" ) func newRequest(ctx context.Context, url, method string) *httplib.Request { + if setting.InternalToken == "" { + log.Fatal(`The INTERNAL_TOKEN setting is missing from the configuration file: %q. +Ensure you are running in the correct environment or set the correct configuration file with -c.`, setting.CustomConf) + } return httplib.NewRequest(url, method). SetContext(ctx). - Header("Authorization", - fmt.Sprintf("Bearer %s", setting.InternalToken)) + Header("Authorization", fmt.Sprintf("Bearer %s", setting.InternalToken)) } // Response internal request response @@ -44,9 +48,6 @@ func newInternalRequest(ctx context.Context, url, method string) *httplib.Reques }) if setting.Protocol == setting.UnixSocket { req.SetTransport(&http.Transport{ - Dial: func(_, _ string) (net.Conn, error) { - return net.Dial("unix", setting.HTTPAddr) - }, DialContext: func(ctx context.Context, _, _ string) (net.Conn, error) { var d net.Dialer return d.DialContext(ctx, "unix", setting.HTTPAddr) -- cgit v1.2.3