public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added message alerts when login failed due to github team membership or email domain requirement, #1731, #1660

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-04-29 10:08:01 +02:00
parent 32fa8180fa
commit 0d3fbb8659
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/sample.ini
+3 -4
View File
@@ -142,8 +142,8 @@
;auth_url = https://github.com/login/oauth/authorize
;token_url = https://github.com/login/oauth/access_token
;api_url = https://api.github.com/user
# Uncomment bellow to only allow specific email domains
; allowed_domains = mycompany.com othercompany.com
;team_ids =
;allowed_domains =
#################################### Google Auth ##########################
[auth.google]
@@ -154,8 +154,7 @@
;auth_url = https://accounts.google.com/o/oauth2/auth
;token_url = https://accounts.google.com/o/oauth2/token
;api_url = https://www.googleapis.com/oauth2/v1/userinfo
# Uncomment bellow to only allow specific email domains
; allowed_domains = mycompany.com othercompany.com
;allowed_domains =
#################################### Logging ##########################
[log]