From 5bfc6e73c2cc8281a589fc2b655d1d6cc9d3522e Mon Sep 17 00:00:00 2001 From: Lukasz Jarosz Date: Wed, 20 Jun 2018 22:31:14 +0200 Subject: [PATCH 1/2] keep database password from preseeded configuration file during installation Signed-off-by: Lukasz Jarosz --- routers/install.go | 1 + 1 file changed, 1 insertion(+) diff --git a/routers/install.go b/routers/install.go index 84e506c70b47..df3f7af44b58 100644 --- a/routers/install.go +++ b/routers/install.go @@ -60,6 +60,7 @@ func Install(ctx *context.Context) { form.DbUser = models.DbCfg.User form.DbName = models.DbCfg.Name form.DbPath = models.DbCfg.Path + form.DbPasswd = models.DbCfg.Passwd ctx.Data["CurDbOption"] = "MySQL" switch models.DbCfg.Type { From b48edd0a64db3a6bf1c41408a1ad37da62db69fc Mon Sep 17 00:00:00 2001 From: Lukasz Jarosz Date: Sun, 24 Jun 2018 19:48:20 +0200 Subject: [PATCH 2/2] changed order of variables to reflect actual order in the form Signed-off-by: Lukasz Jarosz --- routers/install.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/install.go b/routers/install.go index df3f7af44b58..c7c9fed28aae 100644 --- a/routers/install.go +++ b/routers/install.go @@ -58,9 +58,9 @@ func Install(ctx *context.Context) { // Database settings form.DbHost = models.DbCfg.Host form.DbUser = models.DbCfg.User + form.DbPasswd = models.DbCfg.Passwd form.DbName = models.DbCfg.Name form.DbPath = models.DbCfg.Path - form.DbPasswd = models.DbCfg.Passwd ctx.Data["CurDbOption"] = "MySQL" switch models.DbCfg.Type {