Backend: Remove more globals (#29644)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
2020-12-15 19:09:04 +01:00
parent aa8fb1ae98
commit dd2d206d99
35 changed files with 526 additions and 484 deletions
@@ -337,11 +337,11 @@ func (hs *HTTPServer) addMiddlewaresAndStaticRoutes() {
 	m.Use(hs.metricsEndpoint)

 	m.Use(hs.ContextHandler.Middleware)
-	m.Use(middleware.OrgRedirect())
+	m.Use(middleware.OrgRedirect(hs.Cfg))

 	// needs to be after context handler
 	if setting.EnforceDomain {
-		m.Use(middleware.ValidateHostHeader(hs.Cfg.Domain))
+		m.Use(middleware.ValidateHostHeader(hs.Cfg))
 	}

 	m.Use(middleware.HandleNoCacheHeader())