public/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-10-31 21:28:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix #145

Browse Source
This commit is contained in:
Unknown
2014-05-05 02:49:33 -04:00
parent 816c0ed5e7
commit 07c3d497a7
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/base/conf.go
View File

@@ -316,10 +316,12 @@ func NewConfigContext() {
} }
Cfg.BlockMode = false Cfg.BlockMode = false
cfgPath = filepath.Join(workDir, "custom/conf/app.ini") cfgPaths := []string{os.Getenv("GOGS_CONFIG"), filepath.Join(workDir, "custom/conf/app.ini")}
if com.IsFile(cfgPath) { for _, cfgPath := range cfgPaths {
if err = Cfg.AppendFiles(cfgPath); err != nil { if com.IsFile(cfgPath) {
qlog.Fatalf("Cannot load config file(%s): %v\n", cfgPath, err) if err = Cfg.AppendFiles(cfgPath); err != nil {
qlog.Fatalf("Cannot load config file(%s): %v\n", cfgPath, err)
}
} }
} }