Merge pull request #13992 from grafana/auth_proxy_headers_default

add auth.proxy headers to default.ini
7 years ago · 7de07eb096
parent 3b4d8c9b9b 8a74fe2b76
commit 7de07eb096
2 changed files with 2 additions and 0 deletions
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@ -344,6 +344,7 @@ header_property = username
 auto_sign_up = true
 ldap_sync_ttl = 60
 whitelist =
+headers =

 #################################### Auth LDAP ###########################
 [auth.ldap]
--- a/conf/sample.ini
+++ b/conf/sample.ini
@ -294,6 +294,7 @@ log_queries =
 ;auto_sign_up = true
 ;ldap_sync_ttl = 60
 ;whitelist = 192.168.1.1, 192.168.2.1
+;headers = Email:X-User-Email, Name:X-User-Name

 #################################### Basic Auth ##########################
 [auth.basic]