Merge pull request #103 from kabukky/development

Moved Let's Encrypt Option from flag to config.json

config.json

@@ -3,5 +3,6 @@
 	"HttpsHostAndPort":":8085",
 	"HttpsUsage":"None",
 	"Url":"http://127.0.0.1:8084",
-	"HttpsUrl":"https://127.0.0.1:8085"
+	"HttpsUrl":"https://127.0.0.1:8085",
+	"UseLetsEncrypt":false
 }

configuration/configuration.go

@@ -3,11 +3,12 @@ package configuration
 import (
 	"encoding/json"
 	"errors"
-	"github.com/kabukky/journey/filenames"
 	"io/ioutil"
 	"log"
 	"reflect"
 	"strings"
+
+	"github.com/kabukky/journey/filenames"
 )
 
 // Configuration: settings that are neccesary for server configuration
@@ -17,6 +18,7 @@ type Configuration struct {
 	HttpsUsage       string
 	Url              string
 	HttpsUrl         string
+	UseLetsEncrypt   bool
 }
 
 func NewConfiguration() *Configuration {

flags/flags.go

@@ -6,12 +6,11 @@ import (
 )
 
 var (
-	UseLetsEncrypt = false
-	Log            = ""
-	CustomPath     = ""
-	IsInDevMode    = false
-	HttpPort       = ""
-	HttpsPort      = ""
+	Log         = ""
+	CustomPath  = ""
+	IsInDevMode = false
+	HttpPort    = ""
+	HttpsPort   = ""
 )
 
 func init() {
@@ -23,8 +22,6 @@ func init() {
 }
 
 func parseFlags() {
-	// Check if HTTPS certificates should be automatically generated and renewed using Let's Encypt
-	flag.BoolVar(&UseLetsEncrypt, "letsencrypt", false, "Use this option to automatically generate and renew the HTTPS certificates using Let's Encypt. Example: -letsencrypt")
 	// Check if the log should be output to a file
 	flag.StringVar(&Log, "log", "", "Use this option to save to log output to a file. Note: Journey needs create, read, and write access to that file. Example: -log=path/to/log.txt")
 	// Check if a custom content path has been provided by the user

https/https.go

@@ -3,12 +3,12 @@ package https
 import (
 	"net/http"
 
+	"github.com/kabukky/journey/configuration"
 	"github.com/kabukky/journey/filenames"
-	"github.com/kabukky/journey/flags"
 )
 
 func StartServer(addr string, handler http.Handler) error {
-	if flags.UseLetsEncrypt {
+	if configuration.Config.UseLetsEncrypt {
 		server := buildLetsEncryptServer(addr, handler)
 		return server.ListenAndServeTLS("", "")
 	} else {