From 67f27d3d8bdd2a86970574423b293dc129158ec9 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Mon, 16 Jan 2017 13:12:03 +0100 Subject: [PATCH] Force cd into PKI directory --- admin/main.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/admin/main.go b/admin/main.go index ac4bdafc..112d94de 100644 --- a/admin/main.go +++ b/admin/main.go @@ -51,6 +51,9 @@ func main() { if SubmissionDir, err = filepath.Abs(SubmissionDir); err != nil { log.Fatal(err) } + if api.TeamsDir, err = filepath.Abs(api.TeamsDir); err != nil { + log.Fatal(err) + } if fic.FilesDir, err = filepath.Abs(fic.FilesDir); err != nil { log.Fatal(err) } @@ -62,6 +65,10 @@ func main() { baseURL = &tmp } + if err := os.Chdir(PKIDir); err != nil { + log.Fatal("Unable to enter PKI directory at: ", err) + } + log.Println("Opening database...") if err := fic.DBInit(fmt.Sprintf("%s?parseTime=true", *dsn)); err != nil { log.Fatal("Cannot open the database: ", err) @@ -83,8 +90,6 @@ func main() { } - os.Chdir(PKIDir) - log.Println(fmt.Sprintf("Ready, listening on %s", *bind)) if err := http.ListenAndServe(*bind, http.StripPrefix(*baseURL, api.Router())); err != nil { log.Fatal("Unable to listen and serve: ", err)