From a3e8c32a30ef90f5aa0526e8440aa343378dbf26 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 12 Feb 2016 09:19:45 -0500
Subject: Add install option for log path

---
 routers/install.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'routers/install.go')

diff --git a/routers/install.go b/routers/install.go
index fc9e5ec5..b8b7dec1 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -154,6 +154,7 @@ func Install(ctx *middleware.Context) {
 	form.SSHPort = setting.SSHPort
 	form.HTTPPort = setting.HttpPort
 	form.AppUrl = setting.AppUrl
+	form.LogRootPath = setting.LogRootPath
 
 	// E-mail service settings
 	if setting.MailService != nil {
@@ -241,6 +242,14 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
 		return
 	}
 
+	// Test log root path.
+	form.LogRootPath = strings.Replace(form.LogRootPath, "\\", "/", -1)
+	if err := os.MkdirAll(form.LogRootPath, os.ModePerm); err != nil {
+		ctx.Data["Err_LogRootPath"] = true
+		ctx.RenderWithErr(ctx.Tr("install.invalid_log_root_path", err), INSTALL, &form)
+		return
+	}
+
 	// Check run user.
 	curUser := user.CurrentUsername()
 	if form.RunUser != curUser {
@@ -329,6 +338,7 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) {
 
 	cfg.Section("log").Key("MODE").SetValue("file")
 	cfg.Section("log").Key("LEVEL").SetValue("Info")
+	cfg.Section("log").Key("ROOT_PATH").SetValue(form.LogRootPath)
 
 	cfg.Section("security").Key("INSTALL_LOCK").SetValue("true")
 	cfg.Section("security").Key("SECRET_KEY").SetValue(base.GetRandomString(15))
-- 
cgit v1.2.3


From ec478b4b063e767eaf804216d2273d6e1f48d882 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 12 Feb 2016 10:03:04 -0500
Subject: Set default log path if empty during install

---
 routers/install.go     | 10 ++++++++++
 templates/install.tmpl |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'routers/install.go')

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>
 
-- 
cgit v1.2.3


From d3ca5accfd418d789765284542334411337fa45f Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 12 Feb 2016 10:15:47 -0500
Subject: Remove redundant nil check.

---
 routers/install.go | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'routers/install.go')

diff --git a/routers/install.go b/routers/install.go
index 66891296..b8b7dec1 100644
--- a/routers/install.go
+++ b/routers/install.go
@@ -242,16 +242,6 @@ 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 {
-- 
cgit v1.2.3