diff options
Diffstat (limited to 'modules/base/conf.go')
| -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) |