From 597ebb1161b12ebeb1ec41ce51785ac2f5cb8e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.org>
Date: Thu, 15 Dec 2016 14:08:39 +0100
Subject: [PATCH] fix(config): fixed issue setting generic oauth name via ENV
 variable, fixes #6974

---
 conf/defaults.ini | 1 +
 conf/sample.ini   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/conf/defaults.ini b/conf/defaults.ini
index 9b2b1c89827..81d6c8d8050 100644
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -243,6 +243,7 @@ allowed_organizations =
 
 #################################### Generic OAuth #######################
 [auth.generic_oauth]
+name = OAuth
 enabled = false
 allow_sign_up = true
 client_id = some_id
diff --git a/conf/sample.ini b/conf/sample.ini
index adce6f9fac2..6a8aa623f85 100644
--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -219,6 +219,7 @@
 #################################### Generic OAuth ##########################
 [auth.generic_oauth]
 ;enabled = false
+;name = OAuth
 ;allow_sign_up = true
 ;client_id = some_id
 ;client_secret = some_secret