aboutsummaryrefslogtreecommitdiffstats
path: root/routers/install
diff options
context:
space:
mode:
Diffstat (limited to 'routers/install')
-rw-r--r--routers/install/routes.go6
-rw-r--r--routers/install/setting.go3
2 files changed, 2 insertions, 7 deletions
diff --git a/routers/install/routes.go b/routers/install/routes.go
index 82d9c34b41..df82ba2e4c 100644
--- a/routers/install/routes.go
+++ b/routers/install/routes.go
@@ -8,7 +8,6 @@ import (
"fmt"
"html"
"net/http"
- "path"
"code.gitea.io/gitea/modules/httpcache"
"code.gitea.io/gitea/modules/log"
@@ -89,10 +88,7 @@ func Routes(ctx goctx.Context) *web.Route {
r.Use(middle)
}
- r.Use(web.WrapWithPrefix(public.AssetsURLPathPrefix, public.AssetsHandlerFunc(&public.Options{
- Directory: path.Join(setting.StaticRootPath, "public"),
- Prefix: public.AssetsURLPathPrefix,
- }), "InstallAssetsHandler"))
+ r.Use(web.WrapWithPrefix("/assets/", public.AssetsHandlerFunc("/assets/"), "AssetsHandler"))
r.Use(session.Sessioner(session.Options{
Provider: setting.SessionConfig.Provider,
diff --git a/routers/install/setting.go b/routers/install/setting.go
index 68984f1e78..dadefa26a2 100644
--- a/routers/install/setting.go
+++ b/routers/install/setting.go
@@ -30,7 +30,7 @@ func PreloadSettings(ctx context.Context) bool {
}
setting.LoadSettingsForInstall()
- svg.Init()
+ _ = svg.Init()
}
return !setting.InstallLock
@@ -47,6 +47,5 @@ func reloadSettings(ctx context.Context) {
} else {
log.Fatal("ORM engine initialization failed: %v", err)
}
- svg.Init()
}
}