Panel image rendering: now works under self-signed https cert, Fixes #1726

This commit is contained in:
Torkel Ödegaard 2015-04-08 09:06:01 +02:00
parent 059db533d5
commit 6911572fa1
2 changed files with 4 additions and 1 deletions

View File

@ -20,6 +20,9 @@ router_logging = false
; the path relative to grafana process working directory
static_root_path = public
enable_gzip = false
; https certs & key file
cert_file =
cert_key =
[analytics]
# Server reporting, sends usage counters to stats.grafana.org (https).

View File

@ -26,7 +26,7 @@ func RenderToPng(params *RenderOpts) (string, error) {
pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20)))
pngPath = pngPath + ".png"
cmd := exec.Command(binPath, scriptPath, "url="+params.Url, "width="+params.Width,
cmd := exec.Command(binPath, "--ignore-ssl-errors=true", scriptPath, "url="+params.Url, "width="+params.Width,
"height="+params.Height, "png="+pngPath, "cookiename="+setting.SessionOptions.CookieName,
"domain="+setting.Domain, "sessionid="+params.SessionId)
stdout, err := cmd.StdoutPipe()