From 944e6bbde62c266aa3d50f0943a2716ac8d5df4b Mon Sep 17 00:00:00 2001 From: Kamil Trzcinski Date: Thu, 11 Feb 2016 19:37:36 +0100 Subject: Chdir first (always) --- main.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index d5c4b775..1d8d24cb 100644 --- a/main.go +++ b/main.go @@ -3,11 +3,11 @@ package main import ( "flag" "fmt" - "log" - "path/filepath" "io/ioutil" + "log" "net" "os" + "path/filepath" "strings" ) @@ -63,18 +63,17 @@ func main() { fmt.Printf("URL: https://gitlab.com/gitlab-org/gitlab-pages") flag.Parse() + err := os.Chdir(*pagesRoot) + if err != nil { + log.Fatalln(err) + } + var app theApp app.Domain = strings.ToLower(*pagesDomain) - app.RootDir = evalSymlinks(*pagesRoot) app.RedirectHTTP = *redirectHTTP app.HTTP2 = *useHTTP2 - err := os.Chdir(app.RootDir) - if err != nil { - log.Fatalln(err) - } - if *pagesRootCert != "" { app.RootCertificate = readFile(*pagesRootCert) } -- cgit v1.2.3