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 pull request #14460 from grafana/14435_fix

Browse Source 
Add oauth_auto_login setting to defaults file
This commit is contained in:
Torkel Ödegaard 2018-12-12 14:51:51 +01:00 committed by GitHub
commit e08e38bd88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/defaults.ini
View File

@ -246,6 +246,10 @@ disable_signout_menu = false
# URL to redirect the user to after sign out # URL to redirect the user to after sign out
signout_redirect_url = signout_redirect_url =
# Set to true to attempt login with OAuth automatically, skipping the login screen.
# This setting is ignored if multiple OAuth providers are configured.
oauth_auto_login = false
#################################### Anonymous Auth ###################### #################################### Anonymous Auth ######################
[auth.anonymous] [auth.anonymous]
# enable anonymous access # enable anonymous access

4
conf/sample.ini
View File

@ -226,6 +226,10 @@ log_queries =
# URL to redirect the user to after sign out # URL to redirect the user to after sign out
;signout_redirect_url = ;signout_redirect_url =
# Set to true to attempt login with OAuth automatically, skipping the login screen.
# This setting is ignored if multiple OAuth providers are configured.
;oauth_auto_login = false
#################################### Anonymous Auth ########################## #################################### Anonymous Auth ##########################
[auth.anonymous] [auth.anonymous]
# enable anonymous access # enable anonymous access