Merge pull request #14460 from grafana/14435_fix

Add oauth_auto_login setting to defaults file

Merge pull request #14460 from grafana/14435_fix
Add oauth_auto_login setting to defaults file
e08e38bd · Torkel Ödegaard · GitHub · fada00f8 · b9e91cab · e08e38bd
Commit e08e38bd authored Dec 12, 2018 by Torkel Ödegaard Committed by GitHub Dec 12, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

conf/defaults.ini
+4 -0

conf/sample.ini
+4 -0

No files found.
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -246,6 +246,10 @@ disable_signout_menu = false
 # URL to redirect the user to after sign out
 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 ######################
 [auth.anonymous]
 # enable anonymous access

--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -226,6 +226,10 @@ log_queries =
 # URL to redirect the user to after sign out
 ;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 ##########################
 [auth.anonymous]
 # enable anonymous access