Fixed default config path

vishr · vishr · commit 9d10a46f1cf1 · 2018-05-06T10:24:15.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 IMAGE = labstack/armor
-VERSION = 0.4.10
+VERSION = 0.4.11
 
 run:
 	go run cmd/armor/main.go
diff --git a/admin/ui/yarn.lock b/admin/ui/yarn.lock
@@ -3064,7 +3064,7 @@ http-errors@1.6.2, http-errors@~1.6.2:
     statuses ">= 1.3.1 < 2"
 
 http-parser-js@>=0.4.0:
-  version "0.4.10"
+  version "0.4.11"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
 
 http-proxy-middleware@~0.17.4:
diff --git a/armor.go b/armor.go
@@ -92,7 +92,7 @@ type (
 )
 
 const (
-	Version = "0.4.10"
+	Version = "0.4.11"
 	Website = "https://armor.labstack.com"
 )
 
diff --git a/cmd/root.go b/cmd/root.go
@@ -97,6 +97,9 @@ func initConfig() {
 	}
 
 	// Config
+	if configFile == "" {
+		configFile = filepath.Join(a.HomeDir, "config.yaml")
+	}
 	data, err := ioutil.ReadFile(configFile)
 	if err != nil {
 		a.DefaultConfig = true
diff --git a/website/content/guide.md b/website/content/guide.md
@@ -44,7 +44,7 @@ Type `armor` in your terminal
    ___
   / _ | ______ _  ___  ____
  / __ |/ __/  ' \/ _ \/ __/
-/_/ |_/_/ /_/_/_/\___/_/    v0.4.10
+/_/ |_/_/ /_/_/_/\___/_/    v0.4.11
 
 Uncomplicated, modern HTTP server
 https://armor.labstack.com

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ type (`
`92`	`92`	`)`
`93`	`93`
`94`	`94`	`const (`
`95`		`- Version = "0.4.10"`
	`95`	`+ Version = "0.4.11"`
`96`	`96`	`Website = "https://armor.labstack.com"`
`97`	`97`	`)`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -97,6 +97,9 @@ func initConfig() {`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`// Config`
	`100`	`+ if configFile == "" {`
	`101`	`+ configFile = filepath.Join(a.HomeDir, "config.yaml")`
	`102`	`+ }`
`100`	`103`	`data, err := ioutil.ReadFile(configFile)`
`101`	`104`	`if err != nil {`
`102`	`105`	`a.DefaultConfig = true`