IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10059 from FunkyM/local-image-store

Browse Source 
Add support for internal image store
This commit is contained in:
Carl Bergquist
2018-01-22 11:03:00 +01:00
committed by GitHub
parent 6780e00c7d c82e23d96e
commit 184e7046df
7 changed files with 73 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/http_server.go
View File

@@ -162,6 +162,10 @@ func (hs *HttpServer) newMacaron() *macaron.Macaron {
hs.mapStatic(m, setting.StaticRootPath, "", "public")
hs.mapStatic(m, setting.StaticRootPath, "robots.txt", "robots.txt")
if setting.ImageUploadProvider == "local" {
hs.mapStatic(m, setting.ImagesDir, "", "/public/img/attachments")
}
m.Use(macaron.Renderer(macaron.RenderOptions{
Directory: path.Join(setting.StaticRootPath, "views"),
IndentJSON: macaron.Env != macaron.PROD,