diff options
| author | Unknwon <u@gogs.io> | 2016-02-27 20:48:39 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-02-27 20:48:39 -0500 |
| commit | 8055a0bdac005189077df69870cd2ed0b7eebd56 (patch) | |
| tree | bf3fa2bf419006ea846315eef48fb5e83378376c /templates/admin/config.tmpl | |
| parent | 83c74878df3f6edec4fca51e9cec299d2a1bb897 (diff) | |
| download | gitea-8055a0bdac005189077df69870cd2ed0b7eebd56.tar.gz gitea-8055a0bdac005189077df69870cd2ed0b7eebd56.zip | |
Post work for #2637
Improve test cases, config settings, also show SSH config settings on admin config panel.
Diffstat (limited to 'templates/admin/config.tmpl')
| -rw-r--r-- | templates/admin/config.tmpl | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/templates/admin/config.tmpl b/templates/admin/config.tmpl index 8a9e93354e..a6dc2ffcc4 100644 --- a/templates/admin/config.tmpl +++ b/templates/admin/config.tmpl @@ -22,12 +22,16 @@ <dd><i class="fa fa{{if .OfflineMode}}-check{{end}}-square-o"></i></dd> <dt>{{.i18n.Tr "admin.config.disable_router_log"}}</dt> <dd><i class="fa fa{{if .DisableRouterLog}}-check{{end}}-square-o"></i></dd> + <div class="ui divider"></div> + <dt>{{.i18n.Tr "admin.config.run_user"}}</dt> <dd>{{.RunUser}}</dd> <dt>{{.i18n.Tr "admin.config.run_mode"}}</dt> <dd>{{.RunMode}}</dd> + <div class="ui divider"></div> + <dt>{{.i18n.Tr "admin.config.repo_root_path"}}</dt> <dd>{{.RepoRootPath}}</dd> <dt>{{.i18n.Tr "admin.config.static_file_root_path"}}</dt> @@ -42,6 +46,41 @@ </div> <h4 class="ui top attached header"> + {{.i18n.Tr "admin.config.ssh_config"}} + </h4> + <div class="ui attached table segment"> + <dl class="dl-horizontal admin-dl-horizontal"> + <dt>{{.i18n.Tr "admin.config.ssh_enabled"}}</dt> + <dd><i class="fa fa{{if not .SSH.Disabled}}-check{{end}}-square-o"></i></dd> + {{if not .SSH.Disabled}} + <dt>{{.i18n.Tr "admin.config.ssh_start_builtin_server"}}</dt> + <dd><i class="fa fa{{if .SSH.StartBuiltinServer}}-check{{end}}-square-o"></i></dd> + <dt>{{.i18n.Tr "admin.config.ssh_domain"}}</dt> + <dd>{{.SSH.Domain}}</dd> + <dt>{{.i18n.Tr "admin.config.ssh_port"}}</dt> + <dd>{{.SSH.Port}}</dd> + <dt>{{.i18n.Tr "admin.config.ssh_listen_port"}}</dt> + <dd>{{.SSH.ListenPort}}</dd> + + {{if not .SSH.StartBuiltinServer}} + <dt>{{.i18n.Tr "admin.config.ssh_root_path"}}</dt> + <dd>{{.SSH.RootPath}}</dd> + <dt>{{.i18n.Tr "admin.config.ssh_key_test_path"}}</dt> + <dd>{{.SSH.KeyTestPath}}</dd> + <dt>{{.i18n.Tr "admin.config.ssh_keygen_path"}}</dt> + <dd>{{.SSH.KeygenPath}}</dd> + <dt>{{.i18n.Tr "admin.config.ssh_minimum_key_size_check"}}</dt> + <dd><i class="fa fa{{if .SSH.MinimumKeySizeCheck}}-check{{end}}-square-o"></i></dd> + {{if .SSH.MinimumKeySizeCheck}} + <dt>{{.i18n.Tr "admin.config.ssh_minimum_key_sizes"}}</dt> + <dd>{{.SSH.MinimumKeySizes}}</dd> + {{end}} + {{end}} + {{end}} + </dl> + </div> + + <h4 class="ui top attached header"> {{.i18n.Tr "admin.config.db_config"}} </h4> <div class="ui attached table segment"> @@ -109,7 +148,8 @@ <dl class="dl-horizontal admin-dl-horizontal"> <dt>{{.i18n.Tr "admin.config.mailer_enabled"}}</dt> <dd><i class="fa fa{{if .MailerEnabled}}-check{{end}}-square-o"></i></dd> - {{if .MailerEnabled}}<dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt> + {{if .MailerEnabled}} + <dt>{{.i18n.Tr "admin.config.mailer_name"}}</dt> <dd>{{.Mailer.Name}}</dd> <dt>{{.i18n.Tr "admin.config.mailer_disable_helo"}}</dt> <dd><i class="fa fa{{if .Mailer.DisableHelo}}-check{{end}}-square-o"></i></dd> |