diff options
| author | Josh Frye <joshfng@gmail.com> | 2016-02-12 10:03:04 -0500 |
|---|---|---|
| committer | Josh Frye <joshfng@gmail.com> | 2016-02-12 10:03:04 -0500 |
| commit | ec478b4b063e767eaf804216d2273d6e1f48d882 (patch) | |
| tree | ffd24515181b32733f452513cda27e99dcea3bff | |
| parent | 1feecd6beb19ac993afdc36f31207193ca42c553 (diff) | |
Set default log path if empty during install
| -rw-r--r-- | routers/install.go | 10 | ||||
| -rw-r--r-- | templates/install.tmpl | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/routers/install.go b/routers/install.go index b8b7dec1..66891296 100644 --- a/routers/install.go +++ b/routers/install.go @@ -242,6 +242,16 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { return } + // Set default log path if empty. + workDir, err := setting.WorkDir() + if err != nil { + log.Fatal(4, "Fail to get work directory: %v", err) + } + + if len(form.LogRootPath) == 0 { + form.LogRootPath = path.Join(workDir, "log") + } + // Test log root path. form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1) if err := os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil { diff --git a/templates/install.tmpl b/templates/install.tmpl index b3d4d733..1d97abf5 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -109,9 +109,9 @@ <input id="app_url" name="app_url" value="{{.app_url}}" placeholder="e.g. https://try.gogs.io" required> <span class="help">{{.i18n.Tr "install.app_url_helper"}}</span> </div> - <div class="inline required field"> + <div class="inline field"> <label for="log_root_path">{{.i18n.Tr "install.log_root_path"}}</label> - <input id="log_root_path" name="log_root_path" value="{{.log_root_path}}" placeholder="log" required> + <input id="log_root_path" name="log_root_path" value="{{.log_root_path}}" placeholder="log"> <span class="help">{{.i18n.Tr "install.log_root_path_helper"}}</span> </div> |