diff --git a/modules/setting/service.go b/modules/setting/service.go index 9807f33352..1f445f569e 100644 --- a/modules/setting/service.go +++ b/modules/setting/service.go @@ -85,8 +85,7 @@ var Service = struct { DefaultOrgMemberVisible bool UserDeleteWithCommentsMaxTime time.Duration ValidSiteURLSchemes []string - UsernameCooldownPeriod int64 - MaxUserRedirects int64 + LandingPageInfoEnabled bool // OpenID settings EnableOpenIDSignIn bool @@ -207,6 +206,8 @@ func loadServiceFrom(rootCfg ConfigProvider) { Service.DefaultUserIsRestricted = sec.Key("DEFAULT_USER_IS_RESTRICTED").MustBool(false) Service.AllowDotsInUsernames = sec.Key("ALLOW_DOTS_IN_USERNAMES").MustBool(true) Service.EnableTimetracking = sec.Key("ENABLE_TIMETRACKING").MustBool(true) + Service.LandingPageInfoEnabled = sec.Key("ENABLE_LANDING_PAGE_INFO").MustBool(true) + if Service.EnableTimetracking { Service.DefaultEnableTimetracking = sec.Key("DEFAULT_ENABLE_TIMETRACKING").MustBool(true) } @@ -259,14 +260,6 @@ func loadServiceFrom(rootCfg ConfigProvider) { } } Service.ValidSiteURLSchemes = schemes - Service.UsernameCooldownPeriod = sec.Key("USERNAME_COOLDOWN_PERIOD").MustInt64(0) - - // Only set a default if USERNAME_COOLDOWN_PERIOD's feature is active. - maxUserRedirectsDefault := int64(0) - if Service.UsernameCooldownPeriod > 0 { - maxUserRedirectsDefault = 5 - } - Service.MaxUserRedirects = sec.Key("MAX_USER_REDIRECTS").MustInt64(maxUserRedirectsDefault) mustMapSetting(rootCfg, "service.explore", &Service.Explore)