IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(login): invert naming for dissallow user pass login

Browse Source
This commit is contained in:
bergquist
2016-06-25 16:30:41 +02:00
parent 092b6517dc
commit 690a74c6b7
5 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/setting/setting.go
View File

@@ -82,14 +82,14 @@ var (
ExternalEnabled bool
// User settings
AllowUserSignUp bool
AllowUserOrgCreate bool
AutoAssignOrg bool
AutoAssignOrgRole string
VerifyEmailEnabled bool
LoginHint string
DefaultTheme string
DisableUserPassLogin bool
AllowUserSignUp bool
AllowUserOrgCreate bool
AutoAssignOrg bool
AutoAssignOrgRole string
VerifyEmailEnabled bool
LoginHint string
DefaultTheme string
AllowUserPassLogin bool
// Http auth
AdminUser string
@@ -486,7 +486,7 @@ func NewConfigContext(args *CommandLineArgs) error {
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
LoginHint = users.Key("login_hint").String()
DefaultTheme = users.Key("default_theme").String()
DisableUserPassLogin = users.Key("disable_user_pass_login").MustBool(false)
AllowUserPassLogin = users.Key("allow_user_pass_login").MustBool(true)
// anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)