fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-22 16:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

routers/install.go: able to keep previous custom settings for 2nd time install

Browse source 
- .gopmfile: update all commits
This commit is contained in:
Unknwon 2015-02-13 16:48:23 -05:00
parent def39d191b
commit a38e4a0b02
2 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
.gopmfile
View file

@ -2,35 +2,34 @@
path = github.com/gogits/gogs path = github.com/gogits/gogs
[deps] [deps]
github.com/beego/memcache = commit:2aea774416 github.com/bradfitz/gomemcache = commit:72a68649ba
github.com/bradfitz/gomemcache =
github.com/Unknwon/cae = commit:2e70a1351b github.com/Unknwon/cae = commit:2e70a1351b
github.com/Unknwon/com = commit:d9bcf409c8 github.com/Unknwon/com = commit:188d690b1a
github.com/Unknwon/i18n = commit:1e88666229 github.com/Unknwon/i18n = commit:1e88666229
github.com/Unknwon/macaron = github.com/Unknwon/macaron = commit:e089393c3f
github.com/codegangsta/cli = commit:a14c5b47c7 github.com/codegangsta/cli = commit:6086d7927e
github.com/go-sql-driver/mysql = commit:04cf947760 github.com/go-sql-driver/mysql = commit:27633f0519
github.com/go-xorm/core = commit:e7882d8b00 github.com/go-xorm/core = commit:16cb27928f
github.com/go-xorm/xorm = commit:dcc529b68a github.com/go-xorm/xorm = commit:f2d3be988e
github.com/gogits/chardet = commit:2404f77725 github.com/gogits/chardet = commit:2404f77725
github.com/gogits/go-gogs-client = commit:92e76d616a github.com/gogits/go-gogs-client = commit:92e76d616a
github.com/lib/pq = commit:3e3efe51a0 github.com/lib/pq = commit:835d5eb08d
github.com/macaron-contrib/binding = commit:0fbe4b9707 github.com/macaron-contrib/binding = commit:dc739fabc3
github.com/macaron-contrib/cache = github.com/macaron-contrib/cache = commit:b68f6b448f
github.com/macaron-contrib/captcha = commit:3567dc48b8 github.com/macaron-contrib/captcha = commit:066c50c7eb
github.com/macaron-contrib/csrf = commit:3ea14e7ee7 github.com/macaron-contrib/csrf = commit:98ddf5a710
github.com/macaron-contrib/i18n = commit:0ee0539c84 github.com/macaron-contrib/i18n = commit:eeebd44f64
github.com/macaron-contrib/oauth2 = commit:8f394c3629 github.com/macaron-contrib/oauth2 = commit:8f394c3629
github.com/macaron-contrib/session = github.com/macaron-contrib/session = commit:8e8d938b27
github.com/macaron-contrib/toolbox = commit:57127bcc89 github.com/macaron-contrib/toolbox = commit:acbfe36e16
github.com/mattn/go-sqlite3 = commit:a80c27ba33 github.com/mattn/go-sqlite3 = commit:25d045f12a
github.com/microcosm-cc/bluemonday = github.com/microcosm-cc/bluemonday = commit:fcd0f5074e
github.com/nfnt/resize = commit:8f44931448 github.com/nfnt/resize = commit:8f44931448
github.com/russross/blackfriday = commit:05b8cefd6a github.com/russross/blackfriday = commit:77efab57b2
github.com/shurcooL/go = commit:48293cbc7a github.com/shurcooL/go = commit:329f57438c
golang.org/x/net = golang.org/x/net =
golang.org/x/text = golang.org/x/text =
gopkg.in/ini.v1 = commit:28ad8c408b gopkg.in/ini.v1 = commit:4febc4104c
gopkg.in/redis.v2 = commit:e617904962 gopkg.in/redis.v2 = commit:e617904962
[res] [res]

6
routers/install.go
View file

@ -189,6 +189,12 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
// Save settings. // Save settings.
cfg := ini.Empty() 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("DB_TYPE").SetValue(models.DbCfg.Type)
cfg.Section("database").Key("HOST").SetValue(models.DbCfg.Host) cfg.Section("database").Key("HOST").SetValue(models.DbCfg.Host)
cfg.Section("database").Key("NAME").SetValue(models.DbCfg.Name) cfg.Section("database").Key("NAME").SetValue(models.DbCfg.Name)