foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-21 08:31:27 -05:00
Code Issues Wiki Activity

Add custom.ini

Browse source
This commit is contained in:
Unknown 2014-03-10 23:03:17 -04:00
parent 52837e3d36
commit 6ce9d800d0
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -3,4 +3,5 @@ gogs
*.exe~
.DS_Store
*.db
*.log
*.log
conf/custom.ini

2
conf/app.ini
View file

@ -3,7 +3,6 @@ RUN_USER = lunny
[repository]
ROOT = /Users/lunny/git/gogs-repositories
ROOT_jiahuachen = /Users/jiahuachen/git/gogs-repositories
[server]
HTTP_ADDR =
@ -15,7 +14,6 @@ HOST =
NAME = gogs
USER = root
PASSWD =
PASSWD_jiahua = root
[security]
USER_PASSWD_SALT = !#@FDEWREWR&*(

15
models/models.go
View file

@ -7,7 +7,6 @@ package models
import (
"fmt"
"os"
"os/user"
_ "github.com/go-sql-driver/mysql"
"github.com/lunny/xorm"
@ -47,16 +46,7 @@ func setEngine() {
dbUser := base.Cfg.MustValue("database", "USER")
dbPwd := base.Cfg.MustValue("database", "PASSWD")
uname, err := user.Current()
if err != nil {
fmt.Printf("models.init -> fail to get user: %s\n", err)
os.Exit(2)
}
if uname.Username == "jiahuachen" {
dbPwd = base.Cfg.MustValue("database", "PASSWD_jiahua")
}
var err error
switch dbType {
case "mysql":
orm, err = xorm.NewEngine("mysql", fmt.Sprintf("%v:%v@%v/%v?charset=utf8",
@ -83,9 +73,6 @@ func setEngine() {
//log.Trace("Initialized database -> %s", dbName)
RepoRootPath = base.Cfg.MustValue("repository", "ROOT")
if uname.Username == "jiahuachen" {
RepoRootPath = base.Cfg.MustValue("repository", "ROOT_jiahuachen")
}
}
func init() {

12
modules/base/conf.go
View file

@ -11,6 +11,7 @@ import (
"path"
"path/filepath"
"github.com/Unknwon/com"
"github.com/Unknwon/goconfig"
)
@ -36,11 +37,20 @@ func init() {
os.Exit(2)
}
cfgPath := filepath.Join(workDir, "conf", "app.ini")
cfgPathPrefix := filepath.Join(workDir, "conf")
cfgPath := filepath.Join(cfgPathPrefix, "app.ini")
Cfg, err = goconfig.LoadConfigFile(cfgPath)
if err != nil {
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
os.Exit(2)
}
cfgPath = filepath.Join(cfgPathPrefix, "custom.ini")
if com.IsFile(cfgPath) {
if err = Cfg.AppendFiles(cfgPath); err != nil {
fmt.Printf("Cannot load config file '%s'\n", cfgPath)
os.Exit(2)
}
}
Cfg.BlockMode = false
}