diff --git a/conf/defaults.ini b/conf/defaults.ini index 0693044..da59457 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -10,15 +10,15 @@ app_mode = production [paths] # Path to where grafana can store temp files, sessions, and the sqlite3 db (if that is used) # -data = data +data = /var/lib/grafana # # Directory where grafana can store logs # -logs = data/log +logs = /var/log/grafana # # Directory where grafana will automatically scan and look for plugins # -plugins = data/plugins +plugins = /var/lib/grafana/plugins #################################### Server #################################### [server] @@ -45,7 +45,7 @@ root_url = %(protocol)s://%(domain)s:%(http_port)s/ router_logging = false # the path relative working path -static_root_path = public +static_root_path = /usr/share/grafana/public # enable gzip enable_gzip = false @@ -67,7 +67,7 @@ password = ssl_mode = disable # For "sqlite3" only, path relative to data_path setting -path = grafana.db +path = /var/lib/grafana/grafana.db #################################### Session #################################### [session] diff --git a/pkg/components/renderer/renderer.go b/pkg/components/renderer/renderer.go index ec11a9a..01862ee 100644 --- a/pkg/components/renderer/renderer.go +++ b/pkg/components/renderer/renderer.go @@ -21,7 +21,7 @@ type RenderOpts struct { func RenderToPng(params *RenderOpts) (string, error) { log.Info("PhantomRenderer::renderToPng url %v", params.Url) - binPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "phantomjs")) + binPath := "/usr/bin/phantomjs" scriptPath, _ := filepath.Abs(filepath.Join(setting.PhantomDir, "render.js")) pngPath, _ := filepath.Abs(filepath.Join(setting.ImagesDir, util.GetRandomString(20))) pngPath = pngPath + ".png"