diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7e3bfb47b..9b3606b4e 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -17,6 +17,8 @@ import ( "strings" "time" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/user" "github.com/Unknwon/com" _ "github.com/go-macaron/cache/memcache" // memcache plugin for cache _ "github.com/go-macaron/cache/redis" @@ -25,10 +27,6 @@ import ( _ "github.com/kardianos/minwinsvc" // import minwinsvc for windows services "gopkg.in/ini.v1" "strk.kbt.io/projects/go/libravatar" - - "code.gitea.io/gitea/modules/bindata" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/user" ) // Scheme describes protocol types @@ -352,10 +350,7 @@ func NewContext() { log.Fatal(4, "Fail to get work directory: %v", err) } - Cfg, err = ini.Load(bindata.MustAsset("conf/app.ini")) - if err != nil { - log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err) - } + Cfg = ini.Empty() CustomPath = os.Getenv("GITEA_CUSTOM") if len(CustomPath) == 0 {