m79305216
/
gitea
forked from p85947160/gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Do not enforce a builtin app.ini

This commit is contained in:
Thomas Boerger 2016-12-02 15:17:53 +01:00
parent d97b9cf0c2
commit 608b1ce642
No known key found for this signature in database
GPG Key ID: 5A388F55283960B6
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/setting/setting.go
View File

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