Using $HOME/.armor for config and db

Signed-off-by: Vishal Rana <[email protected]>

Author: vishr

Makefile

@@ -1,5 +1,5 @@
 IMAGE = labstack/armor
-VERSION = 0.4.2
+VERSION = 0.4.3
 
 clean:
 	rm -rf build

armor.go

@@ -89,7 +89,7 @@ type (
 )
 
 const (
-	Version = "0.4.2"
+	Version = "0.4.3"
 	Website = "https://armor.labstack.com"
 )
 

cmd/armor/main.go

@@ -19,6 +19,7 @@ import (
 	"github.com/labstack/armor/util"
 	"github.com/labstack/gommon/color"
 	"github.com/labstack/gommon/log"
+	"github.com/mitchellh/go-homedir"
 )
 
 const (
@@ -111,8 +112,18 @@ func main() {
 		Colorer: colorer,
 	}
 
+	// Home dir
+	homeDir, err := homedir.Dir()
+	if err != nil {
+		log.Fatalf("Failed to find home directory %v\n", err)
+	}
+	configDir := filepath.Join(homeDir, ".armor")
+	if err = os.MkdirAll(configDir, 0755); err != nil {
+		log.Fatalf("Failed to create config directory %v\n", err)
+	}
+
 	// Global flags
-	config := flag.String("c", "", "config file")
+	config := flag.String("c", filepath.Join(configDir, "config.yaml"), "config file")
 	port := flag.String("p", "", "listen port")
 	version := flag.Bool("v", false, "armor version")
 
@@ -139,7 +150,7 @@ func main() {
 	}
 
 	// Config - start
-	// Load
+	// Load config
 	data, err := ioutil.ReadFile(*config)
 	if err != nil {
 		// Use default config
@@ -155,19 +166,13 @@ func main() {
 		a.Address = net.JoinHostPort("", *port)
 	}
 
-	// Working directory
-	wd, err := os.Getwd()
-	if err != nil {
-		logger.Fatal(err)
-	}
-
 	// Defaults
 	if a.Address == "" {
 		a.Address = ":80"
 	}
 	if a.SQLite == nil {
 		a.SQLite = &armor.SQLite{
-			URI: filepath.Join(wd, "armor.db"),
+			URI: filepath.Join(configDir, "db"),
 		}
 	}
 	if a.Admin == nil {

website/content/guide.md

@@ -38,7 +38,7 @@ Type `armor` in your terminal
    ___
   / _ | ______ _  ___  ____
  / __ |/ __/  ' \/ _ \/ __/
-/_/ |_/_/ /_/_/_/\___/_/    v0.4.2
+/_/ |_/_/ /_/_/_/\___/_/    v0.4.3
 
 Uncomplicated, modern HTTP server
 https://armor.labstack.com