Work on making grafana work in sub url

grafana @ 5feed234

-Subproject commit 5a3d3f5098c3dfe42d4fbe63f3c43d0d1a154d8a
+Subproject commit 5feed2344ab8a5eb65ffeda9ccae8b768e9b8764

pkg/api/api.go

@@ -4,6 +4,7 @@ import (
 	"github.com/Unknwon/macaron"
 	"github.com/Unknwon/macaron"
 	"github.com/torkelo/grafana-pro/pkg/api/dtos"
 	"github.com/torkelo/grafana-pro/pkg/api/dtos"
 	"github.com/torkelo/grafana-pro/pkg/middleware"
 	"github.com/torkelo/grafana-pro/pkg/middleware"
+	"github.com/torkelo/grafana-pro/pkg/setting"
 )
 )
 
 
 func Register(m *macaron.Macaron) {
 func Register(m *macaron.Macaron) {
@@ -36,7 +37,7 @@ func Register(m *macaron.Macaron) {
 	m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest)
 	m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest)
 
 
 	// user register
 	// user register
-	m.Get("/register/*_", Index)
+	m.Get("/register", Index)
 	m.Post("/api/account", CreateAccount)
 	m.Post("/api/account", CreateAccount)
 
 
 	// dashboards
 	// dashboards
@@ -57,8 +58,10 @@ func Index(ctx *middleware.Context) {
 		return
 		return
 	}
 	}
 
 
-	ctx.Data["user"] = dtos.NewCurrentUser(ctx.UserAccount)
-	ctx.Data["settings"] = settings
+	ctx.Data["User"] = dtos.NewCurrentUser(ctx.UserAccount)
+	ctx.Data["Settings"] = settings
+	ctx.Data["AppUrl"] = setting.AppUrl
+	ctx.Data["AppSubUrl"] = setting.AppSubUrl
 	ctx.HTML(200, "index")
 	ctx.HTML(200, "index")
 }
 }
 
 

pkg/middleware/auth.go

@@ -9,6 +9,7 @@ import (
 
 
 	"github.com/torkelo/grafana-pro/pkg/bus"
 	"github.com/torkelo/grafana-pro/pkg/bus"
 	m "github.com/torkelo/grafana-pro/pkg/models"
 	m "github.com/torkelo/grafana-pro/pkg/models"
+	"github.com/torkelo/grafana-pro/pkg/setting"
 )
 )
 
 
 func authGetRequestAccountId(c *Context, sess session.Store) (int64, error) {
 func authGetRequestAccountId(c *Context, sess session.Store) (int64, error) {
@@ -29,7 +30,7 @@ func authGetRequestAccountId(c *Context, sess session.Store) (int64, error) {
 }
 }
 
 
 func authDenied(c *Context) {
 func authDenied(c *Context) {
-	c.Redirect("/login")
+	c.Redirect(setting.AppSubUrl + "/login")
 }
 }
 
 
 func Auth() macaron.Handler {
 func Auth() macaron.Handler {

pkg/setting/setting.go

@@ -126,7 +126,9 @@ func NewConfigContext() {
 	if err != nil {
 	if err != nil {
 		log.Fatal(4, "Invalid root_url(%s): %s", AppUrl, err)
 		log.Fatal(4, "Invalid root_url(%s): %s", AppUrl, err)
 	}
 	}
+
 	AppSubUrl = strings.TrimSuffix(url.Path, "/")
 	AppSubUrl = strings.TrimSuffix(url.Path, "/")
+	log.Info("AppSubUrl: %v", AppSubUrl)
 
 
 	Protocol = HTTP
 	Protocol = HTTP
 	if Cfg.MustValue("server", "protocol") == "https" {
 	if Cfg.MustValue("server", "protocol") == "https" {