diff options
| -rw-r--r-- | modules/base/conf.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index 126fd63d2e..73552732b1 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -316,10 +316,12 @@ func NewConfigContext() { } Cfg.BlockMode = false - cfgPath = filepath.Join(workDir, "custom/conf/app.ini") - if com.IsFile(cfgPath) { - if err = Cfg.AppendFiles(cfgPath); err != nil { - qlog.Fatalf("Cannot load config file(%s): %v\n", cfgPath, err) + cfgPaths := []string{os.Getenv("GOGS_CONFIG"), filepath.Join(workDir, "custom/conf/app.ini")} + for _, cfgPath := range cfgPaths { + if com.IsFile(cfgPath) { + if err = Cfg.AppendFiles(cfgPath); err != nil { + qlog.Fatalf("Cannot load config file(%s): %v\n", cfgPath, err) + } } } |