diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:52:56 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:52:56 -0400 |
| commit | eeb793524f2da4afdca017b585d9cfb6e9628e85 (patch) | |
| tree | bb991219822ee3e4327939d92986f6f7f00196da | |
| parent | 6ef3e8b3c9a085e3d99b02ba7bb80fc8126f2f90 (diff) | |
| download | gitea-eeb793524f2da4afdca017b585d9cfb6e9628e85.tar.gz gitea-eeb793524f2da4afdca017b585d9cfb6e9628e85.zip | |
Check run user
| -rw-r--r-- | conf/app.ini | 4 | ||||
| -rw-r--r-- | gogs.go | 15 | ||||
| -rw-r--r-- | modules/base/conf.go | 21 | ||||
| -rw-r--r-- | templates/user/delete.tmpl | 4 |
4 files changed, 15 insertions, 29 deletions
diff --git a/conf/app.ini b/conf/app.ini index 809ea61c07..4c2398dd68 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -1,8 +1,8 @@ ; App name that shows on every page title APP_NAME = Gogs: Go Git Service APP_LOGO = img/favicon.png -; !!MUST CHANGE TO YOUR USER NAME!! -RUN_USER = lunny +; Check it if you run locally +RUN_USER = git ; Either "dev", "prod" or "test", default is "dev" RUN_MODE = dev @@ -7,7 +7,6 @@ package main import ( "os" - // "os/user" "runtime" "github.com/codegangsta/cli" @@ -27,21 +26,7 @@ func init() { runtime.GOMAXPROCS(runtime.NumCPU()) } -// func checkRunUser() bool { -// u, err := user.Current() -// if err != nil { -// // TODO: log -// return false -// } -// return u.Username == base.Cfg.MustValue("", "RUN_USER") -// } - func main() { - /*if !checkRunUser() { - println("The command should be run as", base.Cfg.MustValue("", "RUN_USER")) - return - }*/ - app := cli.NewApp() app.Name = "Gogs" app.Usage = "Go Git Service" diff --git a/modules/base/conf.go b/modules/base/conf.go index d3122a5339..c692ddc23f 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -259,16 +259,11 @@ func NewConfigContext() { Cfg.BlockMode = false cfgPath = filepath.Join(workDir, "custom/conf/app.ini") - if !com.IsFile(cfgPath) { - fmt.Println("Custom configuration not found(custom/conf/app.ini)\n" + - "Please create it and make your own configuration!") - os.Exit(2) - - } - - if err = Cfg.AppendFiles(cfgPath); err != nil { - fmt.Printf("Cannot load config file '%s'\n", cfgPath) - os.Exit(2) + if com.IsFile(cfgPath) { + if err = Cfg.AppendFiles(cfgPath); err != nil { + fmt.Printf("Cannot load config file '%s'\n", cfgPath) + os.Exit(2) + } } AppName = Cfg.MustValue("", "APP_NAME", "Gogs: Go Git Service") @@ -276,7 +271,13 @@ func NewConfigContext() { AppUrl = Cfg.MustValue("server", "ROOT_URL") Domain = Cfg.MustValue("server", "DOMAIN") SecretKey = Cfg.MustValue("security", "SECRET_KEY") + RunUser = Cfg.MustValue("", "RUN_USER") + curUser := os.Getenv("USERNAME") + if RunUser != curUser { + fmt.Printf("Expect user(%s) but current user is: %s\n", RunUser, curUser) + os.Exit(2) + } EnableHttpsClone = Cfg.MustBool("security", "ENABLE_HTTPS_CLONE", false) diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl index 46376672d4..04c713eb65 100644 --- a/templates/user/delete.tmpl +++ b/templates/user/delete.tmpl @@ -6,9 +6,9 @@ <ul class="list-group"> <li class="list-group-item"><a href="/user/setting">Account Profile</a></li> <li class="list-group-item"><a href="/user/setting/password">Password</a></li> - <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> + <!-- <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> --> <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> - <li class="list-group-item"><a href="/user/setting/security">Security</a></li> + <!-- <li class="list-group-item"><a href="/user/setting/security">Security</a></li> --> <li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li> </ul> </div> |