diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-12 21:40:18 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-12 21:40:18 -0400 |
| commit | 8dd956f88a0d279296e5b5440cde8bd877ca0fea (patch) | |
| tree | 40710391f6a81a0e99799139984a4795ccaba086 /modules | |
| parent | a9a5fb45f8b0b31f0219d7a0957db1a43a72f6e0 (diff) | |
| download | gitea-8dd956f88a0d279296e5b5440cde8bd877ca0fea.tar.gz gitea-8dd956f88a0d279296e5b5440cde8bd877ca0fea.zip | |
Move custom dir to custom/
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/base/conf.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index 1240448c10..809b2b8c18 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -37,15 +37,14 @@ func init() { os.Exit(2) } - cfgPathPrefix := filepath.Join(workDir, "conf") - cfgPath := filepath.Join(cfgPathPrefix, "app.ini") + cfgPath := filepath.Join(workDir, "conf/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") + cfgPath = filepath.Join(workDir, "custom/conf/app.ini") if com.IsFile(cfgPath) { if err = Cfg.AppendFiles(cfgPath); err != nil { fmt.Printf("Cannot load config file '%s'\n", cfgPath) |