Fixed #209

3 files changed, 11 insertions, 361 deletions

diff --git a/modules/base/conf.go b/modules/base/conf.go
deleted file mode 100644
index df2bd82722..0000000000
--- a/modules/base/conf.go
+++ /dev/null
@@ -1,354 +0,0 @@
-// Copyright 2014 The Gogs Authors. All rights reserved.
-// Use of this source code is governed by a MIT-style
-// license that can be found in the LICENSE file.
-
-package base
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/Unknwon/com"
-	"github.com/Unknwon/goconfig"
-	qlog "github.com/qiniu/log"
-
-	"github.com/gogits/cache"
-	"github.com/gogits/session"
-
-	"github.com/gogits/gogs/modules/log"
-)
-
-// Mailer represents mail service.
-type Mailer struct {
-	Name         string
-	Host         string
-	User, Passwd string
-}
-
-type OauthInfo struct {
-	ClientId, ClientSecret string
-	Scopes                 string
-	AuthUrl, TokenUrl      string
-}
-
-// Oauther represents oauth service.
-type Oauther struct {
-	GitHub, Google, Tencent,
-	Twitter, Weibo bool
-	OauthInfos map[string]*OauthInfo
-}
-
-var (
-	AppVer           string
-	AppName          string
-	AppLogo          string
-	AppUrl           string
-	SshPort          int
-	OfflineMode      bool
-	DisableRouterLog bool
-	ProdMode         bool
-	Domain           string
-	SecretKey        string
-	RunUser          string
-
-	RepoRootPath string
-	ScriptType   string
-
-	InstallLock bool
-
-	LogInRememberDays  int
-	CookieUserName     string
-	CookieRememberName string
-
-	Cfg          *goconfig.ConfigFile
-	MailService  *Mailer
-	OauthService *Oauther
-
-	LogModes   []string
-	LogConfigs []string
-
-	Cache        cache.Cache
-	CacheAdapter string
-	CacheConfig  string
-
-	SessionProvider string
-	SessionConfig   *session.Config
-	SessionManager  *session.Manager
-
-	PictureService  string
-	DisableGravatar bool
-
-	EnableRedis    bool
-	EnableMemcache bool
-)
-
-var Service struct {
-	RegisterEmailConfirm bool
-	DisableRegistration  bool
-	RequireSignInView    bool
-	EnableCacheAvatar    bool
-	NotifyMail           bool
-	ActiveCodeLives      int
-	ResetPwdCodeLives    int
-	LdapAuth             bool
-}
-
-// ExecDir returns absolute path execution(binary) path.
-func ExecDir() (string, error) {
-	file, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		return "", err
-	}
-	p, err := filepath.Abs(file)
-	if err != nil {
-		return "", err
-	}
-	return path.Dir(strings.Replace(p, "\\", "/", -1)), nil
-}
-
-var logLevels = map[string]string{
-	"Trace":    "0",
-	"Debug":    "1",
-	"Info":     "2",
-	"Warn":     "3",
-	"Error":    "4",
-	"Critical": "5",
-}
-
-func newService() {
-	Service.ActiveCodeLives = Cfg.MustInt("service", "ACTIVE_CODE_LIVE_MINUTES", 180)
-	Service.ResetPwdCodeLives = Cfg.MustInt("service", "RESET_PASSWD_CODE_LIVE_MINUTES", 180)
-	Service.DisableRegistration = Cfg.MustBool("service", "DISABLE_REGISTRATION", false)
-	Service.RequireSignInView = Cfg.MustBool("service", "REQUIRE_SIGNIN_VIEW", false)
-	Service.EnableCacheAvatar = Cfg.MustBool("service", "ENABLE_CACHE_AVATAR", false)
-}
-
-func newLogService() {
-	log.Info("%s %s", AppName, AppVer)
-
-	// Get and check log mode.
-	LogModes = strings.Split(Cfg.MustValue("log", "MODE", "console"), ",")
-	LogConfigs = make([]string, len(LogModes))
-	for i, mode := range LogModes {
-		mode = strings.TrimSpace(mode)
-		modeSec := "log." + mode
-		if _, err := Cfg.GetSection(modeSec); err != nil {
-			qlog.Fatalf("Unknown log mode: %s\n", mode)
-		}
-
-		// Log level.
-		levelName := Cfg.MustValueRange("log."+mode, "LEVEL", "Trace",
-			[]string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"})
-		level, ok := logLevels[levelName]
-		if !ok {
-			qlog.Fatalf("Unknown log level: %s\n", levelName)
-		}
-
-		// Generate log configuration.
-		switch mode {
-		case "console":
-			LogConfigs[i] = fmt.Sprintf(`{"level":%s}`, level)
-		case "file":
-			logPath := Cfg.MustValue(modeSec, "FILE_NAME", "log/gogs.log")
-			os.MkdirAll(path.Dir(logPath), os.ModePerm)
-			LogConfigs[i] = fmt.Sprintf(
-				`{"level":%s,"filename":"%s","rotate":%v,"maxlines":%d,"maxsize":%d,"daily":%v,"maxdays":%d}`, level,
-				logPath,
-				Cfg.MustBool(modeSec, "LOG_ROTATE", true),
-				Cfg.MustInt(modeSec, "MAX_LINES", 1000000),
-				1<<uint(Cfg.MustInt(modeSec, "MAX_SIZE_SHIFT", 28)),
-				Cfg.MustBool(modeSec, "DAILY_ROTATE", true),
-				Cfg.MustInt(modeSec, "MAX_DAYS", 7))
-		case "conn":
-			LogConfigs[i] = fmt.Sprintf(`{"level":"%s","reconnectOnMsg":%v,"reconnect":%v,"net":"%s","addr":"%s"}`, level,
-				Cfg.MustBool(modeSec, "RECONNECT_ON_MSG", false),
-				Cfg.MustBool(modeSec, "RECONNECT", false),
-				Cfg.MustValueRange(modeSec, "PROTOCOL", "tcp", []string{"tcp", "unix", "udp"}),
-				Cfg.MustValue(modeSec, "ADDR", ":7020"))
-		case "smtp":
-			LogConfigs[i] = fmt.Sprintf(`{"level":"%s","username":"%s","password":"%s","host":"%s","sendTos":"%s","subject":"%s"}`, level,
-				Cfg.MustValue(modeSec, "USER", "example@example.com"),
-				Cfg.MustValue(modeSec, "PASSWD", "******"),
-				Cfg.MustValue(modeSec, "HOST", "127.0.0.1:25"),
-				Cfg.MustValue(modeSec, "RECEIVERS", "[]"),
-				Cfg.MustValue(modeSec, "SUBJECT", "Diagnostic message from serve"))
-		case "database":
-			LogConfigs[i] = fmt.Sprintf(`{"level":"%s","driver":"%s","conn":"%s"}`, level,
-				Cfg.MustValue(modeSec, "DRIVER"),
-				Cfg.MustValue(modeSec, "CONN"))
-		}
-
-		log.NewLogger(Cfg.MustInt64("log", "BUFFER_LEN", 10000), mode, LogConfigs[i])
-		log.Info("Log Mode: %s(%s)", strings.Title(mode), levelName)
-	}
-}
-
-func newCacheService() {
-	CacheAdapter = Cfg.MustValueRange("cache", "ADAPTER", "memory", []string{"memory", "redis", "memcache"})
-	if EnableRedis {
-		log.Info("Redis Enabled")
-	}
-	if EnableMemcache {
-		log.Info("Memcache Enabled")
-	}
-
-	switch CacheAdapter {
-	case "memory":
-		CacheConfig = fmt.Sprintf(`{"interval":%d}`, Cfg.MustInt("cache", "INTERVAL", 60))
-	case "redis", "memcache":
-		CacheConfig = fmt.Sprintf(`{"conn":"%s"}`, Cfg.MustValue("cache", "HOST"))
-	default:
-		qlog.Fatalf("Unknown cache adapter: %s\n", CacheAdapter)
-	}
-
-	var err error
-	Cache, err = cache.NewCache(CacheAdapter, CacheConfig)
-	if err != nil {
-		qlog.Fatalf("Init cache system failed, adapter: %s, config: %s, %v\n",
-			CacheAdapter, CacheConfig, err)
-	}
-
-	log.Info("Cache Service Enabled")
-}
-
-func newSessionService() {
-	SessionProvider = Cfg.MustValueRange("session", "PROVIDER", "memory",
-		[]string{"memory", "file", "redis", "mysql"})
-
-	SessionConfig = new(session.Config)
-	SessionConfig.ProviderConfig = Cfg.MustValue("session", "PROVIDER_CONFIG")
-	SessionConfig.CookieName = Cfg.MustValue("session", "COOKIE_NAME", "i_like_gogits")
-	SessionConfig.CookieSecure = Cfg.MustBool("session", "COOKIE_SECURE")
-	SessionConfig.EnableSetCookie = Cfg.MustBool("session", "ENABLE_SET_COOKIE", true)
-	SessionConfig.GcIntervalTime = Cfg.MustInt64("session", "GC_INTERVAL_TIME", 86400)
-	SessionConfig.SessionLifeTime = Cfg.MustInt64("session", "SESSION_LIFE_TIME", 86400)
-	SessionConfig.SessionIDHashFunc = Cfg.MustValueRange("session", "SESSION_ID_HASHFUNC",
-		"sha1", []string{"sha1", "sha256", "md5"})
-	SessionConfig.SessionIDHashKey = Cfg.MustValue("session", "SESSION_ID_HASHKEY")
-
-	if SessionProvider == "file" {
-		os.MkdirAll(path.Dir(SessionConfig.ProviderConfig), os.ModePerm)
-	}
-
-	var err error
-	SessionManager, err = session.NewManager(SessionProvider, *SessionConfig)
-	if err != nil {
-		qlog.Fatalf("Init session system failed, provider: %s, %v\n",
-			SessionProvider, err)
-	}
-
-	log.Info("Session Service Enabled")
-}
-
-func newMailService() {
-	// Check mailer setting.
-	if !Cfg.MustBool("mailer", "ENABLED") {
-		return
-	}
-
-	MailService = &Mailer{
-		Name:   Cfg.MustValue("mailer", "NAME", AppName),
-		Host:   Cfg.MustValue("mailer", "HOST"),
-		User:   Cfg.MustValue("mailer", "USER"),
-		Passwd: Cfg.MustValue("mailer", "PASSWD"),
-	}
-	log.Info("Mail Service Enabled")
-}
-
-func newRegisterMailService() {
-	if !Cfg.MustBool("service", "REGISTER_EMAIL_CONFIRM") {
-		return
-	} else if MailService == nil {
-		log.Warn("Register Mail Service: Mail Service is not enabled")
-		return
-	}
-	Service.RegisterEmailConfirm = true
-	log.Info("Register Mail Service Enabled")
-}
-
-func newNotifyMailService() {
-	if !Cfg.MustBool("service", "ENABLE_NOTIFY_MAIL") {
-		return
-	} else if MailService == nil {
-		log.Warn("Notify Mail Service: Mail Service is not enabled")
-		return
-	}
-	Service.NotifyMail = true
-	log.Info("Notify Mail Service Enabled")
-}
-
-func NewConfigContext() {
-	workDir, err := ExecDir()
-	if err != nil {
-		qlog.Fatalf("Fail to get work directory: %s\n", err)
-	}
-
-	cfgPath := filepath.Join(workDir, "conf/app.ini")
-	Cfg, err = goconfig.LoadConfigFile(cfgPath)
-	if err != nil {
-		qlog.Fatalf("Cannot load config file(%s): %v\n", cfgPath, err)
-	}
-	Cfg.BlockMode = false
-
-	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)
-			}
-		}
-	}
-
-	AppName = Cfg.MustValue("", "APP_NAME", "Gogs: Go Git Service")
-	AppLogo = Cfg.MustValue("", "APP_LOGO", "img/favicon.png")
-	AppUrl = Cfg.MustValue("server", "ROOT_URL")
-	Domain = Cfg.MustValue("server", "DOMAIN")
-	SshPort = Cfg.MustInt("server", "SSH_PORT", 22)
-	OfflineMode = Cfg.MustBool("server", "OFFLINE_MODE", false)
-	DisableRouterLog = Cfg.MustBool("server", "DISABLE_ROUTER_LOG", false)
-	SecretKey = Cfg.MustValue("security", "SECRET_KEY")
-
-	InstallLock = Cfg.MustBool("security", "INSTALL_LOCK", false)
-
-	RunUser = Cfg.MustValue("", "RUN_USER")
-	curUser := os.Getenv("USER")
-	if len(curUser) == 0 {
-		curUser = os.Getenv("USERNAME")
-	}
-	// Does not check run user when the install lock is off.
-	if InstallLock && RunUser != curUser {
-		qlog.Fatalf("Expect user(%s) but current user is: %s\n", RunUser, curUser)
-	}
-
-	LogInRememberDays = Cfg.MustInt("security", "LOGIN_REMEMBER_DAYS")
-	CookieUserName = Cfg.MustValue("security", "COOKIE_USERNAME")
-	CookieRememberName = Cfg.MustValue("security", "COOKIE_REMEMBER_NAME")
-
-	PictureService = Cfg.MustValue("picture", "SERVICE")
-	DisableGravatar = Cfg.MustBool("picture", "DISABLE_GRAVATAR", false)
-
-	// Determine and create root git reposiroty path.
-	homeDir, err := com.HomeDir()
-	if err != nil {
-		qlog.Fatalf("Fail to get home directory): %v\n", err)
-	}
-	RepoRootPath = Cfg.MustValue("repository", "ROOT", filepath.Join(homeDir, "gogs-repositories"))
-	if err = os.MkdirAll(RepoRootPath, os.ModePerm); err != nil {
-		qlog.Fatalf("Fail to create RepoRootPath(%s): %v\n", RepoRootPath, err)
-	}
-	ScriptType = Cfg.MustValue("repository", "SCRIPT_TYPE", "bash")
-}
-
-func NewBaseServices() {
-	newService()
-	newLogService()
-	newCacheService()
-	newSessionService()
-	newMailService()
-	newRegisterMailService()
-	newNotifyMailService()
-}
diff --git a/modules/base/template.go b/modules/base/template.go
index 5aa8ac5cc8..8df8d82498 100644
--- a/modules/base/template.go
+++ b/modules/base/template.go
@@ -13,6 +13,8 @@ import (
 	"runtime"
 	"strings"
 	"time"
+
+	"github.com/gogits/gogs/modules/setting"
 )
 
 func Str2html(raw string) template.HTML {
@@ -52,16 +54,16 @@ var TemplateFuncs template.FuncMap = map[string]interface{}{
 		return runtime.Version()
 	},
 	"AppName": func() string {
-		return AppName
+		return setting.AppName
 	},
 	"AppVer": func() string {
-		return AppVer
+		return setting.AppVer
 	},
 	"AppDomain": func() string {
-		return Domain
+		return setting.Domain
 	},
 	"CdnMode": func() bool {
-		return ProdMode && !OfflineMode
+		return setting.ProdMode && !setting.OfflineMode
 	},
 	"LoadTimes": func(startTime time.Time) string {
 		return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
diff --git a/modules/base/tool.go b/modules/base/tool.go
index 812d7634bf..a8bad9de3b 100644
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -16,6 +16,8 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	"github.com/gogits/gogs/modules/setting"
 )
 
 // Encode string to md5 hex value
@@ -131,7 +133,7 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
 
 	// create sha1 encode string
 	sh := sha1.New()
-	sh.Write([]byte(data + SecretKey + startStr + endStr + ToStr(minutes)))
+	sh.Write([]byte(data + setting.SecretKey + startStr + endStr + ToStr(minutes)))
 	encoded := hex.EncodeToString(sh.Sum(nil))
 
 	code := fmt.Sprintf("%s%06d%s", startStr, minutes, encoded)
@@ -140,9 +142,9 @@ func CreateTimeLimitCode(data string, minutes int, startInf interface{}) string
 
 // AvatarLink returns avatar link by given e-mail.
 func AvatarLink(email string) string {
-	if DisableGravatar {
+	if setting.DisableGravatar {
 		return "/img/avatar_default.jpg"
-	} else if Service.EnableCacheAvatar {
+	} else if setting.Service.EnableCacheAvatar {
 		return "/avatar/" + EncodeMd5(email)
 	}
 	return "//1.gravatar.com/avatar/" + EncodeMd5(email)