From 1f3033329458d9dd4f7b7ece949a5bbbde441532 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 3 Jan 2023 13:11:52 -0600 Subject: [PATCH 1/2] fix: update settings table on install Signed-off-by: jolheiser --- routers/install/install.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/routers/install/install.go b/routers/install/install.go index ab37f9ba35fed..9beee98bc396c 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -148,8 +148,8 @@ func Install(ctx *context.Context) { // Server and other services settings form.OfflineMode = setting.OfflineMode - form.DisableGravatar = false // when installing, there is no database connection so that given a default value - form.EnableFederatedAvatar = false // when installing, there is no database connection so that given a default value + form.DisableGravatar = false // when installing, there is no database connection so that given a default value + form.EnableFederatedAvatar = !setting.InstallLock // when installing, there is no database connection so that given a default value form.EnableOpenIDSignIn = setting.Service.EnableOpenIDSignIn form.EnableOpenIDSignUp = setting.Service.EnableOpenIDSignUp @@ -442,10 +442,13 @@ func SubmitInstall(ctx *context.Context) { cfg.Section("server").Key("OFFLINE_MODE").SetValue(fmt.Sprint(form.OfflineMode)) // if you are reinstalling, this maybe not right because of missing version if err := system_model.SetSettingNoVersion(system_model.KeyPictureDisableGravatar, strconv.FormatBool(form.DisableGravatar)); err != nil { - ctx.RenderWithErr(ctx.Tr("install.secret_key_failed", err), tplInstall, &form) + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), tplInstall, &form) + return + } + if err := system_model.SetSettingNoVersion(system_model.KeyPictureEnableFederatedAvatar, strconv.FormatBool(form.EnableFederatedAvatar)); err != nil { + ctx.RenderWithErr(ctx.Tr("install.save_config_failed", err), tplInstall, &form) return } - cfg.Section("picture").Key("ENABLE_FEDERATED_AVATAR").SetValue(fmt.Sprint(form.EnableFederatedAvatar)) cfg.Section("openid").Key("ENABLE_OPENID_SIGNIN").SetValue(fmt.Sprint(form.EnableOpenIDSignIn)) cfg.Section("openid").Key("ENABLE_OPENID_SIGNUP").SetValue(fmt.Sprint(form.EnableOpenIDSignUp)) cfg.Section("service").Key("DISABLE_REGISTRATION").SetValue(fmt.Sprint(form.DisableRegistration)) From 58674e00339516c2028cb241771c205db5c61b8b Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 3 Jan 2023 13:39:39 -0600 Subject: [PATCH 2/2] fix: install should use same setting defaults as before Signed-off-by: jolheiser --- routers/install/install.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/routers/install/install.go b/routers/install/install.go index 9beee98bc396c..e9fa844a09568 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -148,8 +148,8 @@ func Install(ctx *context.Context) { // Server and other services settings form.OfflineMode = setting.OfflineMode - form.DisableGravatar = false // when installing, there is no database connection so that given a default value - form.EnableFederatedAvatar = !setting.InstallLock // when installing, there is no database connection so that given a default value + form.DisableGravatar = setting.DisableGravatar // when installing, there is no database connection so that given a default value + form.EnableFederatedAvatar = setting.EnableFederatedAvatar // when installing, there is no database connection so that given a default value form.EnableOpenIDSignIn = setting.Service.EnableOpenIDSignIn form.EnableOpenIDSignUp = setting.Service.EnableOpenIDSignUp