mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Work on making grafana work in sub url
This commit is contained in:
parent
9ba34aabab
commit
f25a415a9e
2
grafana
2
grafana
@ -1 +1 @@
|
||||
Subproject commit 5a3d3f5098c3dfe42d4fbe63f3c43d0d1a154d8a
|
||||
Subproject commit 5feed2344ab8a5eb65ffeda9ccae8b768e9b8764
|
@ -4,6 +4,7 @@ import (
|
||||
"github.com/Unknwon/macaron"
|
||||
"github.com/torkelo/grafana-pro/pkg/api/dtos"
|
||||
"github.com/torkelo/grafana-pro/pkg/middleware"
|
||||
"github.com/torkelo/grafana-pro/pkg/setting"
|
||||
)
|
||||
|
||||
func Register(m *macaron.Macaron) {
|
||||
@ -36,7 +37,7 @@ func Register(m *macaron.Macaron) {
|
||||
m.Any("/api/datasources/proxy/:id/*", auth, ProxyDataSourceRequest)
|
||||
|
||||
// user register
|
||||
m.Get("/register/*_", Index)
|
||||
m.Get("/register", Index)
|
||||
m.Post("/api/account", CreateAccount)
|
||||
|
||||
// dashboards
|
||||
@ -57,8 +58,10 @@ func Index(ctx *middleware.Context) {
|
||||
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")
|
||||
}
|
||||
|
||||
|
@ -9,6 +9,7 @@ import (
|
||||
|
||||
"github.com/torkelo/grafana-pro/pkg/bus"
|
||||
m "github.com/torkelo/grafana-pro/pkg/models"
|
||||
"github.com/torkelo/grafana-pro/pkg/setting"
|
||||
)
|
||||
|
||||
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) {
|
||||
c.Redirect("/login")
|
||||
c.Redirect(setting.AppSubUrl + "/login")
|
||||
}
|
||||
|
||||
func Auth() macaron.Handler {
|
||||
|
@ -126,7 +126,9 @@ func NewConfigContext() {
|
||||
if err != nil {
|
||||
log.Fatal(4, "Invalid root_url(%s): %s", AppUrl, err)
|
||||
}
|
||||
|
||||
AppSubUrl = strings.TrimSuffix(url.Path, "/")
|
||||
log.Info("AppSubUrl: %v", AppSubUrl)
|
||||
|
||||
Protocol = HTTP
|
||||
if Cfg.MustValue("server", "protocol") == "https" {
|
||||
|
Loading…
Reference in New Issue
Block a user