realaravinth/forgejo-federation
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity

Include more variables on admin/config page (#6378)

Browse source 
Include the current CustomPath location in the admin section and also
display GITEA_WORK_DIR and/or GITEA_CUSTOM env var if they are set.

Right now there is no easy way to see this information, and if you try
and help most users they won't be able to tell you anything about these
values -- just that their custom template isn't working, files aren't in
the right place, etc... Now you can see all paths and if they were set
by ENV or not.
This commit is contained in:
mrsdizzie 2019-03-19 18:40:13 -04:00 committed by techknowlogick
parent 5c82ef098e
commit f125330fcf
3 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View file

@ -1629,6 +1629,7 @@ config.app_name = Site Title
config.app_ver = Gitea Version config.app_ver = Gitea Version
config.app_url = Gitea Base URL config.app_url = Gitea Base URL
config.custom_conf = Configuration File Path config.custom_conf = Configuration File Path
config.custom_file_root_path = "Custom File Root Path"
config.domain = SSH Server Domain config.domain = SSH Server Domain
config.offline_mode = Local Mode config.offline_mode = Local Mode
config.disable_router_log = Disable Router Log config.disable_router_log = Disable Router Log

16
routers/admin/admin.go
View file

@ -6,6 +6,7 @@ package admin
import ( import (
"fmt" "fmt"
"os"
"runtime" "runtime"
"strings" "strings"
"time" "time"
@ -211,6 +212,7 @@ func Config(ctx *context.Context) {
ctx.Data["RunMode"] = strings.Title(macaron.Env) ctx.Data["RunMode"] = strings.Title(macaron.Env)
ctx.Data["GitVersion"] = setting.Git.Version ctx.Data["GitVersion"] = setting.Git.Version
ctx.Data["RepoRootPath"] = setting.RepoRootPath ctx.Data["RepoRootPath"] = setting.RepoRootPath
ctx.Data["CustomRootPath"] = setting.CustomPath
ctx.Data["StaticRootPath"] = setting.StaticRootPath ctx.Data["StaticRootPath"] = setting.StaticRootPath
ctx.Data["LogRootPath"] = setting.LogRootPath ctx.Data["LogRootPath"] = setting.LogRootPath
ctx.Data["ScriptType"] = setting.ScriptType ctx.Data["ScriptType"] = setting.ScriptType
@ -240,6 +242,20 @@ func Config(ctx *context.Context) {
ctx.Data["Git"] = setting.Git ctx.Data["Git"] = setting.Git
type envVar struct {
Name, Value string
}
envVars := map[string]*envVar{}
if len(os.Getenv("GITEA_WORK_DIR")) > 0 {
envVars["GITEA_WORK_DIR"] = &envVar{"GITEA_WORK_DIR", os.Getenv("GITEA_WORK_DIR")}
}
if len(os.Getenv("GITEA_CUSTOM")) > 0 {
envVars["GITEA_CUSTOM"] = &envVar{"GITEA_CUSTOM", os.Getenv("GITEA_CUSTOM")}
}
ctx.Data["EnvVars"] = envVars
type logger struct { type logger struct {
Mode, Config string Mode, Config string
} }

11
templates/admin/config.tmpl
View file

@ -41,12 +41,23 @@
<dd>{{.RepoRootPath}}</dd> <dd>{{.RepoRootPath}}</dd>
<dt>{{.i18n.Tr "admin.config.static_file_root_path"}}</dt> <dt>{{.i18n.Tr "admin.config.static_file_root_path"}}</dt>
<dd>{{.StaticRootPath}}</dd> <dd>{{.StaticRootPath}}</dd>
<dt>{{.i18n.Tr "admin.config.custom_file_root_path"}}</dt>
<dd>{{.CustomRootPath}}</dd>
<dt>{{.i18n.Tr "admin.config.log_file_root_path"}}</dt> <dt>{{.i18n.Tr "admin.config.log_file_root_path"}}</dt>
<dd>{{.LogRootPath}}</dd> <dd>{{.LogRootPath}}</dd>
<dt>{{.i18n.Tr "admin.config.script_type"}}</dt> <dt>{{.i18n.Tr "admin.config.script_type"}}</dt>
<dd>{{.ScriptType}}</dd> <dd>{{.ScriptType}}</dd>
<dt>{{.i18n.Tr "admin.config.reverse_auth_user"}}</dt> <dt>{{.i18n.Tr "admin.config.reverse_auth_user"}}</dt>
<dd>{{.ReverseProxyAuthUser}}</dd> <dd>{{.ReverseProxyAuthUser}}</dd>
{{if .EnvVars }}
<div class="ui divider"></div>
{{range .EnvVars}}
<dt>{{.Name}}</dt>
<dd>{{.Value}}</dd>
{{end}}
{{end}}
</dl> </dl>
</div> </div>