diff --git a/cmd/web.go b/cmd/web.go index 683b19c82a..4a2a1de1fe 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -164,8 +164,6 @@ func serveInstall(_ context.Context, ctx *cli.Command) error { } func serveInstalled(_ context.Context, ctx *cli.Command) error { - setting.InitCfgProvider(setting.CustomConf) - setting.LoadCommonSettings() setting.MustInstalled() showWebStartupMessage("Prepare to run web server") diff --git a/modules/setting/setting.go b/modules/setting/setting.go index fac6e54fb1..44dad1fab1 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -119,8 +119,8 @@ func loadCommonSettingsFrom(cfg ConfigProvider) error { mustCurrentRunUserMatch(cfg) // it depends on the SSH config, only non-builtin SSH server requires this check - loadOAuth2From(cfg) loadSecurityFrom(cfg) + loadOAuth2From(cfg) if err := loadAttachmentFrom(cfg); err != nil { return err }