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

277a696f · Torkel Ödegaard · GitHub · 739bee02 · 277a696f · 277a696f
Commit 277a696f authored Aug 14, 2018 by Torkel Ödegaard Committed by GitHub Aug 14, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

conf/defaults.ini
+3 -0

conf/sample.ini
+4 -0

No files found.
--- a/conf/defaults.ini
+++ b/conf/defaults.ini
@@ -315,6 +315,9 @@ api_url =
 team_ids =
 allowed_organizations =
 tls_skip_verify_insecure = false
+tls_client_cert =
+tls_client_key =
+tls_client_ca =

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

--- a/conf/sample.ini
+++ b/conf/sample.ini
@@ -272,6 +272,10 @@ log_queries =
 ;api_url = https://foo.bar/user
 ;team_ids =
 ;allowed_organizations =
+;tls_skip_verify_insecure = false
+;tls_client_cert =
+;tls_client_key =
+;tls_client_ca =

 #################################### Grafana.com Auth ####################
 [auth.grafana_com]