IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-15 11:12:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename the setting and add description

Browse Source
This commit is contained in:
Tomas Dabasinskas 2018-12-19 14:59:33 +02:00
parent 08c12313fe
commit 3aa24b3afa
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/defaults.ini
View File

@ -335,7 +335,7 @@ tls_skip_verify_insecure = false
tls_client_cert = tls_client_cert =
tls_client_key = tls_client_key =
tls_client_ca = tls_client_ca =
broken_auth_header_provider = false send_client_credentials_via_post = false
#################################### Basic Auth ########################## #################################### Basic Auth ##########################
[auth.basic] [auth.basic]

5
conf/sample.ini
View File

@ -283,7 +283,10 @@ log_queries =
;tls_client_cert = ;tls_client_cert =
;tls_client_key = ;tls_client_key =
;tls_client_ca = ;tls_client_ca =
;broken_auth_header_provider = false
; Set to true to enable sending client_id and client_secret via POST body instead of Basic authentication HTTP header
; This might be required if the OAuth provider is not RFC6749 compliant, only supporting credentials passed via POST payload
;send_client_credentials_via_post = false
#################################### Grafana.com Auth #################### #################################### Grafana.com Auth ####################
[auth.grafana_com] [auth.grafana_com]

2
pkg/social/social.go
View File

@ -79,7 +79,7 @@ func NewOAuthService() {
TlsClientKey: sec.Key("tls_client_key").String(), TlsClientKey: sec.Key("tls_client_key").String(),
TlsClientCa: sec.Key("tls_client_ca").String(), TlsClientCa: sec.Key("tls_client_ca").String(),
TlsSkipVerify: sec.Key("tls_skip_verify_insecure").MustBool(), TlsSkipVerify: sec.Key("tls_skip_verify_insecure").MustBool(),
BrokenAuthHeaderProvider: sec.Key("broken_auth_header_provider").MustBool(), BrokenAuthHeaderProvider: sec.Key("send_client_credentials_via_post").MustBool(),
} }
if !info.Enabled { if !info.Enabled {