diff options
Diffstat (limited to 'modules/setting/setting.go')
| -rw-r--r-- | modules/setting/setting.go | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 923c45674c..1ddbf6d2bc 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -297,10 +297,18 @@ func init() { // WorkDir returns absolute path of work directory. func WorkDir() (string, error) { - wd := os.Getenv("GOGS_WORK_DIR") + wd := os.Getenv("GITEA_WORK_DIR") if len(wd) > 0 { return wd, nil } + // Use GOGS_WORK_DIR if available, for backward compatibility + // TODO: drop in 1.1.0 ? + wd = os.Getenv("GOGS_WORK_DIR") + if len(wd) > 0 { + log.Warn(`Usage of GOGS_WORK_DIR is deprecated and will be *removed* in a future release, +please consider changing to GITEA_WORK_DIR`) + return wd, nil + } i := strings.LastIndex(AppPath, "/") if i == -1 { @@ -341,9 +349,17 @@ func NewContext() { log.Fatal(4, "Fail to parse 'conf/app.ini': %v", err) } - CustomPath = os.Getenv("GOGS_CUSTOM") + CustomPath = os.Getenv("GITEA_CUSTOM") if len(CustomPath) == 0 { - CustomPath = workDir + "/custom" + // For backward compatibility + // TODO: drop in 1.1.0 ? + CustomPath = os.Getenv("GOGS_CUSTOM") + if len(CustomPath) == 0 { + CustomPath = workDir + "/custom" + } else { + log.Warn(`Usage of GOGS_CUSTOM is deprecated and will be *removed* in a future release, +please consider changing to GITEA_CUSTOM`) + } } if len(CustomConf) == 0 { |