Show correct SSL Mode on "install page" (#25818)

diff --git a/routers/install/install.go b/routers/install/install.go
index a2e89d3dac48d12f19afd0924b51d351b2950a36..6a8f56127135db7e44836553eaa2300ac8b9e23e 100644 (file)
--- a/routers/install/install.go
+++ b/routers/install/install.go
@@ -102,6 +102,7 @@ func Install(ctx *context.Context) {
        form.DbName = setting.Database.Name
        form.DbPath = setting.Database.Path
        form.DbSchema = setting.Database.Schema
+       form.SSLMode = setting.Database.SSLMode
 
        curDBType := setting.Database.Type.String()
        var isCurDBTypeSupported bool

diff --git a/templates/install.tmpl b/templates/install.tmpl
index b5caab148981d1853376886152bee0e33e1cca8e..1716d0a5e41e1f310e387ef8d436dc0d107ea9c2 100644 (file)
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -28,7 +28,7 @@
                                                </div>
                                        </div>
 
-                                       <div class="gt-hidden" data-db-setting-for="common-host">
+                                       <div class="gt-mt-4 gt-hidden" data-db-setting-for="common-host">
                                                <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
                                                        <label for="db_host">{{.locale.Tr "install.host"}}</label>
                                                        <input id="db_host" name="db_host" value="{{.db_host}}">
@@ -47,7 +47,7 @@
                                                </div>
                                        </div>
 
-                                       <div class="gt-hidden" data-db-setting-for="postgres">
+                                       <div class="gt-mt-4 gt-hidden" data-db-setting-for="postgres">
                                                <div class="inline required field">
                                                        <label>{{.locale.Tr "install.ssl_mode"}}</label>
                                                        <div class="ui selection database type dropdown">
@@ -68,7 +68,7 @@
                                                </div>
                                        </div>
 
-                                       <div class="gt-hidden" data-db-setting-for="sqlite3">
+                                       <div class="gt-mt-4 gt-hidden" data-db-setting-for="sqlite3">
                                                <div class="inline required field {{if or .Err_DbPath .Err_DbSetting}}error{{end}}">
                                                        <label for="db_path">{{.locale.Tr "install.path"}}</label>
                                                        <input id="db_path" name="db_path" value="{{.db_path}}">