From f125330fcf89550e380057d69dae61871b5b0c8b Mon Sep 17 00:00:00 2001 From: mrsdizzie Date: Tue, 19 Mar 2019 18:40:13 -0400 Subject: [PATCH] Include more variables on admin/config page (#6378) 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. --- options/locale/locale_en-US.ini | 1 + routers/admin/admin.go | 16 ++++++++++++++++ templates/admin/config.tmpl | 11 +++++++++++ 3 files changed, 28 insertions(+) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ffccad1d5..331b94db3 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1629,6 +1629,7 @@ config.app_name = Site Title config.app_ver = Gitea Version config.app_url = Gitea Base URL config.custom_conf = Configuration File Path +config.custom_file_root_path = "Custom File Root Path" config.domain = SSH Server Domain config.offline_mode = Local Mode config.disable_router_log = Disable Router Log diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 7d98e1af3..4a46c1f43 100644 --- a/routers/admin/admin.go +++ b/routers/admin/admin.go @@ -6,6 +6,7 @@ package admin import ( "fmt" + "os" "runtime" "strings" "time" @@ -211,6 +212,7 @@ func Config(ctx *context.Context) { ctx.Data["RunMode"] = strings.Title(macaron.Env) ctx.Data["GitVersion"] = setting.Git.Version ctx.Data["RepoRootPath"] = setting.RepoRootPath + ctx.Data["CustomRootPath"] = setting.CustomPath ctx.Data["StaticRootPath"] = setting.StaticRootPath ctx.Data["LogRootPath"] = setting.LogRootPath ctx.Data["ScriptType"] = setting.ScriptType @@ -240,6 +242,20 @@ func Config(ctx *context.Context) { 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 { Mode, Config string } diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index becaca61e..82db75ffb 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -41,12 +41,23 @@
{{.RepoRootPath}}
{{.i18n.Tr "admin.config.static_file_root_path"}}
{{.StaticRootPath}}
+
{{.i18n.Tr "admin.config.custom_file_root_path"}}
+
{{.CustomRootPath}}
{{.i18n.Tr "admin.config.log_file_root_path"}}
{{.LogRootPath}}
{{.i18n.Tr "admin.config.script_type"}}
{{.ScriptType}}
{{.i18n.Tr "admin.config.reverse_auth_user"}}
{{.ReverseProxyAuthUser}}
+ + {{if .EnvVars }} +
+ {{range .EnvVars}} +
{{.Name}}
+
{{.Value}}
+ {{end}} + {{end}} +