diff --git a/conf/sample.ini b/conf/sample.ini index e33938dbef7..bc312fdfc49 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -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). diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index 619a302210e..aa9e0c92525 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -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()