lfs: show configs in admin ui (#6128)

* Rename template consts

* Display new DB options

* Display LFS configs

conf/locale/locale_en-US.ini

@@ -1231,6 +1231,8 @@ config.db.ssl_mode = SSL mode
 config.db.ssl_mode_helper = (for "postgres" only)
 config.db.path = Path
 config.db.path_helper = (for "sqlite3"only)
+config.db.max_open_conns = Maximum open connections
+config.db.max_idle_conns = Maximum idle connections
 
 config.security_config = Security configuration
 config.security.login_remember_days = Login remember days
@@ -1330,6 +1332,10 @@ config.git.clone_timeout = Clone timeout
 config.git.pull_timeout = Pull timeout
 config.git.gc_timeout = GC timeout
 
+config.lfs_config = LFS configuration
+config.lfs.storage = Storage
+config.lfs.objects_path = Objects path
+
 config.log_config = Log configuration
 config.log_file_root_path = Log file root path
 config.log_mode = Mode

internal/conf/conf.go

@@ -359,14 +359,21 @@ func Init(customConf string) error {
 	}
 	I18n.dateLangs = File.Section("i18n.datelang").KeysHash()
 
+	// *************************
+	// ----- LFS settings -----
+	// *************************
+
+	if err = File.Section("lfs").MapTo(&LFS); err != nil {
+		return errors.Wrap(err, "mapping [lfs] section")
+	}
+	LFS.ObjectsPath = ensureAbs(LFS.ObjectsPath)
+
 	handleDeprecated()
 
 	if err = File.Section("cache").MapTo(&Cache); err != nil {
 		return errors.Wrap(err, "mapping [cache] section")
 	} else if err = File.Section("http").MapTo(&HTTP); err != nil {
 		return errors.Wrap(err, "mapping [http] section")
-	} else if err = File.Section("lfs").MapTo(&LFS); err != nil {
-		return errors.Wrap(err, "mapping [lfs] section")
 	} else if err = File.Section("release").MapTo(&Release); err != nil {
 		return errors.Wrap(err, "mapping [release] section")
 	} else if err = File.Section("webhook").MapTo(&Webhook); err != nil {

internal/route/admin/admin.go

@@ -22,9 +22,9 @@ import (
 )
 
 const (
-	DASHBOARD = "admin/dashboard"
-	CONFIG    = "admin/config"
-	MONITOR   = "admin/monitor"
+	tmplDashboard = "admin/dashboard"
+	tmplConfig    = "admin/config"
+	tmplMonitor   = "admin/monitor"
 )
 
 // initTime is the time when the application was initialized.
@@ -123,7 +123,7 @@ func Dashboard(c *context.Context) {
 	// FIXME: update periodically
 	updateSystemStatus()
 	c.Data["SysStatus"] = sysStatus
-	c.Success(DASHBOARD)
+	c.Success(tmplDashboard)
 }
 
 // Operation types.
@@ -209,6 +209,7 @@ func Config(c *context.Context) {
 	c.Data["Mirror"] = conf.Mirror
 	c.Data["Webhook"] = conf.Webhook
 	c.Data["Git"] = conf.Git
+	c.Data["LFS"] = conf.LFS
 
 	c.Data["LogRootPath"] = conf.Log.RootPath
 	type logger struct {
@@ -225,7 +226,7 @@ func Config(c *context.Context) {
 	}
 	c.Data["Loggers"] = loggers
 
-	c.Success(CONFIG)
+	c.Success(tmplConfig)
 }
 
 func Monitor(c *context.Context) {
@@ -234,5 +235,5 @@ func Monitor(c *context.Context) {
 	c.Data["PageIsAdminMonitor"] = true
 	c.Data["Processes"] = process.Processes
 	c.Data["Entries"] = cron.ListTasks()
-	c.Success(MONITOR)
+	c.Success(tmplMonitor)
 }

templates/admin/config.tmpl

@@ -178,6 +178,13 @@
 						<dd>{{.Database.SSLMode}} {{.i18n.Tr "admin.config.db.ssl_mode_helper"}}</dd>
 						<dt>{{.i18n.Tr "admin.config.db.path"}}</dt>
 						<dd><code>{{.Database.Path}}</code> {{.i18n.Tr "admin.config.db.path_helper"}}</dd>
+
+						<div class="ui divider"></div>
+
+						<dt>{{.i18n.Tr "admin.config.db.max_open_conns"}}</dt>
+						<dd>{{.Database.MaxOpenConns}}</dd>
+						<dt>{{.i18n.Tr "admin.config.db.max_idle_conns"}}</dt>
+						<dd>{{.Database.MaxIdleConns}}</dd>
 					</dl>
 				</div>
 
@@ -481,6 +488,20 @@
 					</dl>
 				</div>
 
+				{{/* LFS settings */}}
+				<h4 class="ui top attached header">
+					{{.i18n.Tr "admin.config.lfs_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.i18n.Tr "admin.config.lfs.storage"}}</dt>
+						<dd>{{.LFS.Storage}}</dd>
+						<dt>{{.i18n.Tr "admin.config.lfs.objects_path"}}</dt>
+						<dd><code>{{.LFS.ObjectsPath}}</code></dd>
+					</dl>
+				</div>
+
+				{{/* Log settings */}}
 				<h4 class="ui top attached header">
 					{{.i18n.Tr "admin.config.log_config"}}
 				</h4>