removed the need for symbolic link to grafana/src

2014-12-30 12:03:03 +01:00
parent b2f70c12b9
commit e738a67e06
6 changed files with 14 additions and 9 deletions
@@ -52,6 +52,7 @@ var (
 	CertFile, KeyFile  string
 	RouterLogging      bool
 	StaticRootPath     string
+	TemplatesRootPath  string

 	// Session settings.
 	SessionOptions session.Options
@@ -137,7 +138,8 @@ func NewConfigContext() {
 		HttpPort = port
 	}

-	StaticRootPath = Cfg.MustValue("server", "static_root_path", workDir)
+	StaticRootPath = Cfg.MustValue("server", "static_root_path", path.Join(workDir, "grafana/src"))
+	TemplatesRootPath = Cfg.MustValue("server", "templates_path", path.Join(workDir, "templates"))
 	RouterLogging = Cfg.MustBool("server", "router_logging", false)

 	// PhantomJS rendering