IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-27 16:57:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: added missing ini default keys, fixes #12800 (#12912)

Browse Source
This commit is contained in:
Torkel Ödegaard 2018-08-14 08:49:56 +02:00 committed by GitHub
parent 739bee0207
commit 277a696fa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/defaults.ini
View File

@ -315,6 +315,9 @@ api_url =
team_ids = team_ids =
allowed_organizations = allowed_organizations =
tls_skip_verify_insecure = false tls_skip_verify_insecure = false
tls_client_cert =
tls_client_key =
tls_client_ca =
#################################### Basic Auth ########################## #################################### Basic Auth ##########################
[auth.basic] [auth.basic]

4
conf/sample.ini
View File

@ -272,6 +272,10 @@ log_queries =
;api_url = https://foo.bar/user ;api_url = https://foo.bar/user
;team_ids = ;team_ids =
;allowed_organizations = ;allowed_organizations =
;tls_skip_verify_insecure = false
;tls_client_cert =
;tls_client_key =
;tls_client_ca =
#################################### Grafana.com Auth #################### #################################### Grafana.com Auth ####################
[auth.grafana_com] [auth.grafana_com]