conf: overhaul repository settings (#5932)

3 files changed, 4 insertions, 6 deletions

diff --git a/internal/route/admin/admin.go b/internal/route/admin/admin.go
index d40a5fc4..3c90e3af 100644
--- a/internal/route/admin/admin.go
+++ b/internal/route/admin/admin.go
@@ -199,13 +199,11 @@ func Config(c *context.Context) {
 	c.Data["App"] = conf.App
 	c.Data["Server"] = conf.Server
 	c.Data["SSH"] = conf.SSH
+	c.Data["Repository"] = conf.Repository
 
 	c.Data["LogRootPath"] = conf.LogRootPath
 	c.Data["ReverseProxyAuthUser"] = conf.ReverseProxyAuthUser
 
-	c.Data["RepoRootPath"] = conf.RepoRootPath
-	c.Data["ScriptType"] = conf.ScriptType
-	c.Data["Repository"] = conf.Repository
 	c.Data["HTTP"] = conf.HTTP
 
 	c.Data["DbCfg"] = db.DbCfg
diff --git a/internal/route/install.go b/internal/route/install.go
index 0747ebf0..fdc7b18b 100644
--- a/internal/route/install.go
+++ b/internal/route/install.go
@@ -155,7 +155,7 @@ func Install(c *context.Context) {
 
 	// Application general settings
 	f.AppName = conf.App.BrandName
-	f.RepoRootPath = conf.RepoRootPath
+	f.RepoRootPath = conf.Repository.Root
 
 	// Note(unknwon): it's hard for Windows users change a running user,
 	// 	so just use current one if config says default.
diff --git a/internal/route/repo/http.go b/internal/route/repo/http.go
index 9b780dde..07c89326 100644
--- a/internal/route/repo/http.go
+++ b/internal/route/repo/http.go
@@ -19,11 +19,11 @@ import (
 	"gopkg.in/macaron.v1"
 	log "unknwon.dev/clog/v2"
 
+	"gogs.io/gogs/internal/conf"
 	"gogs.io/gogs/internal/context"
 	"gogs.io/gogs/internal/db"
 	"gogs.io/gogs/internal/db/errors"
 	"gogs.io/gogs/internal/lazyregexp"
-	"gogs.io/gogs/internal/conf"
 	"gogs.io/gogs/internal/tool"
 )
 
@@ -368,7 +368,7 @@ func getGitRepoPath(dir string) (string, error) {
 		dir += ".git"
 	}
 
-	filename := path.Join(conf.RepoRootPath, dir)
+	filename := path.Join(conf.Repository.Root, dir)
 	if _, err := os.Stat(filename); os.IsNotExist(err) {
 		return "", err
 	}