Added tls-config folder

Author: jmartin82

Dockerfile

@@ -14,12 +14,13 @@ RUN apk --no-cache add --virtual build-dependencies \
   && apk del --purge build-dependencies
 
 RUN mkdir /config
+RUN mkdir /tls
 
 VOLUME /config
 
-ADD server.crt / 
-ADD server.key / 
+ADD server.crt /tls 
+ADD server.key /tls 
 
 EXPOSE 8082 8083 8084
 
-ENTRYPOINT ["mmock","-config-path","/config"]
+ENTRYPOINT ["mmock","-config-path","/config","-tls-path","/tls"]

mmock.go

@@ -114,11 +114,12 @@ func getVarsProcessor() vars.Processor {
 	return vars.Processor{FillerFactory: vars.MockFillerFactory{FakeAdapter: fakedata.FakeAdapter{}}}
 }
 
-func startServer(ip string, port, portTLS int, done chan bool, router server.Resolver, mLog chan definition.Match, scenario scenario.Director, varsProcessor vars.Processor, spier match.Spier) {
+func startServer(ip string, port, portTLS int, configTLS string, done chan bool, router server.Resolver, mLog chan definition.Match, scenario scenario.Director, varsProcessor vars.Processor, spier match.Spier) {
 	dispatcher := server.Dispatcher{
 		IP:         ip,
 		Port:       port,
 		PortTLS:    portTLS,
+		ConfigTLS:  configTLS,
 		Resolver:   router,
 		Translator: translate.HTTP{},
 		Processor:  varsProcessor,
@@ -145,6 +146,7 @@ func main() {
 	banner()
 	outIP := getOutboundIP()
 	path, err := filepath.Abs("./config")
+	TLS, err := filepath.Abs("./tls")
 	if err != nil {
 		panic(ErrNotFoundDefaultPath)
 	}
@@ -157,6 +159,7 @@ func main() {
 	cPort := flag.Int("console-port", 8082, "Console server Port")
 	console := flag.Bool("console", true, "Console enabled  (true/false)")
 	cPath := flag.String("config-path", path, "Mocks definition folder")
+	cTLS := flag.String("tls-path", TLS, "TLS config folder (server.crt and server.key should be inside)")
 
 	flag.Parse()
 
@@ -180,7 +183,7 @@ func main() {
 	}
 	defer statistics.Stop()
 
-	go startServer(*sIP, *sPort, *sPortTLS, done, router, mLog, scenario, varsProcessor, spy)
+	go startServer(*sIP, *sPort, *sPortTLS, *cTLS, done, router, mLog, scenario, varsProcessor, spy)
 	log.Printf("HTTP Server running at %s:%d\n", *sIP, *sPort)
 	log.Printf("HTTPS Server running at %s:%d\n", *sIP, *sPortTLS)
 	if *console {

server/dispatcher.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"math/rand"
 	"net/http"
+	"path"
 	"strconv"
 	"time"
 
@@ -22,6 +23,7 @@ type Dispatcher struct {
 	IP         string
 	Port       int
 	PortTLS    int
+	ConfigTLS  string
 	Resolver   Resolver
 	Translator translate.MessageTranslator
 	Processor  vars.Processor
@@ -113,6 +115,8 @@ func (di *Dispatcher) getMatchingResult(request *definition.Request) (*definitio
 func (di Dispatcher) Start() {
 	addr := fmt.Sprintf("%s:%d", di.IP, di.Port)
 	addrTLS := fmt.Sprintf("%s:%d", di.IP, di.PortTLS)
+	crt := path.Join(di.ConfigTLS, "server.crt")
+	key := path.Join(di.ConfigTLS, "server.key")
 
 	errCh := make(chan error)
 
@@ -121,7 +125,7 @@ func (di Dispatcher) Start() {
 	}()
 
 	go func() {
-		errCh <- http.ListenAndServeTLS(addrTLS, "server.crt", "server.key", &di)
+		errCh <- http.ListenAndServeTLS(addrTLS, crt, key, &di)
 	}()
 
 	err := <-errCh