diff options
| author | Unknwon <u@gogs.io> | 2015-02-22 22:51:25 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-02-22 22:51:25 -0500 |
| commit | 7ccab9cd09eca8fa60fdd519c97c259d4b521abd (patch) | |
| tree | 914ea87da32fd27d889b2145f559c0fdad8c62af /routers/install.go | |
| parent | 25f5a8d7986a710cef01d02725071d2de0a6b143 (diff) | |
| parent | 2369881808a906f3072c935ab0575f08bd358821 (diff) | |
Merge branch 'dev' of github.com:gogits/gogs into access
Conflicts:
gogs.go
models/models.go
models/user.go
templates/.VERSION
templates/org/home.tmpl
Diffstat (limited to 'routers/install.go')
| -rw-r--r-- | routers/install.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/routers/install.go b/routers/install.go index a3583a1a..a7828e35 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) |