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

Merge branch 'ldap_login_hints' of https://github.com/tmonk42/grafana into tmonk42-ldap_login_hints

Browse Source 
Conflicts:
	conf/defaults.ini
	pkg/setting/setting.go

closes #2571
closes #2494
This commit is contained in:
carl bergquist
2015-12-11 15:16:57 +01:00
parent 8910351f5c 74ea266157
commit fab1062c0b
6 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/login.go
View File

@@ -28,6 +28,7 @@ func LoginView(c *middleware.Context) {
settings["googleAuthEnabled"] = setting.OAuthService.Google
settings["githubAuthEnabled"] = setting.OAuthService.GitHub
settings["disableUserSignUp"] = !setting.AllowUserSignUp
settings["loginHint"] = setting.LoginHint
if !tryLoginUsingRememberCookie(c) {
c.HTML(200, VIEW_INDEX)

2
pkg/setting/setting.go
View File

@@ -82,6 +82,7 @@ var (
AutoAssignOrg bool
AutoAssignOrgRole string
VerifyEmailEnabled bool
LoginHint string
// Http auth
AdminUser string
@@ -436,6 +437,7 @@ func NewConfigContext(args *CommandLineArgs) error {
AutoAssignOrg = users.Key("auto_assign_org").MustBool(true)
AutoAssignOrgRole = users.Key("auto_assign_org_role").In("Editor", []string{"Editor", "Admin", "Read Only Editor", "Viewer"})
VerifyEmailEnabled = users.Key("verify_email_enabled").MustBool(false)
LoginHint = users.Key("login_hint").String()
// anonymous access
AnonymousEnabled = Cfg.Section("auth.anonymous").Key("enabled").MustBool(false)