From a38e4a0b027f7be1f5523dc8e729f6f8300a8095 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 13 Feb 2015 16:48:23 -0500 Subject: routers/install.go: able to keep previous custom settings for 2nd time install - .gopmfile: update all commits --- routers/install.go | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'routers') diff --git a/routers/install.go b/routers/install.go index a3583a1a98..a7828e351c 100644 --- a/routers/install.go +++ b/routers/install.go @@ -189,6 +189,12 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { // Save settings. cfg := ini.Empty() + if com.IsFile(setting.CustomConf) { + // Keeps custom settings if there is already something. + if err := cfg.Append(setting.CustomConf); err != nil { + log.Error(4, "Fail to load custom conf '%s': %v", setting.CustomConf, err) + } + } cfg.Section("database").Key("DB_TYPE").SetValue(models.DbCfg.Type) cfg.Section("database").Key("HOST").SetValue(models.DbCfg.Host) cfg.Section("database").Key("NAME").SetValue(models.DbCfg.Name) -- cgit v1.2.3