From 07c3d497a7cffe12f4dae828dc8bd82980595b3c Mon Sep 17 00:00:00 2001
From: Unknown <joe2010xtmf@163.com>
Date: Mon, 5 May 2014 02:49:33 -0400
Subject: [PATCH] Fix #145

---
 modules/base/conf.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/base/conf.go b/modules/base/conf.go
index 126fd63d2..73552732b 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)
+			}
 		}
 	}