From cc88e28213b9d56190657788e2bb4fa38cc892b4 Mon Sep 17 00:00:00 2001
From: emile <emile@vauge.com>
Date: Fri, 11 Sep 2015 16:48:52 +0200
Subject: [PATCH] SSL frontend

---
 ROADMAP.md       |  4 ++--
 configuration.go |  1 +
 traefik.go       | 27 ++++++++++++++++-----------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/ROADMAP.md b/ROADMAP.md
index 27906b268..9c549748d 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -1,12 +1,10 @@
  # /træfɪk/
 
-* Logs
 * Default configuration values
 * Retry with streams
 * Static files
 * Licence
 * Add traefik.indlude all/enabled policy
-* SSL frontend support
 * SSL backends support
 * Consul support
 * README
@@ -24,3 +22,5 @@
 * ~~Weights~~
 * ~~Filter traefik.enabled=false apps~~
 * ~~Filter no exposed port apps~~
+* ~~Logs~~
+* ~~SSL frontend support~~
diff --git a/configuration.go b/configuration.go
index 2f1bc8cf1..cf0c43a71 100644
--- a/configuration.go
+++ b/configuration.go
@@ -6,6 +6,7 @@ type GlobalConfiguration struct {
 	AccessLogsFile    string
 	TraefikLogsFile   string
 	TraefikLogsStdout bool
+	CertFile, KeyFile string
 	LogLevel          string
 	Docker            *DockerProvider
 	File              *FileProvider
diff --git a/traefik.go b/traefik.go
index a7a1d1c5f..660a5961d 100644
--- a/traefik.go
+++ b/traefik.go
@@ -39,11 +39,12 @@ func main() {
 	if err != nil {
 		log.Fatal("Error getting level", err)
 	}
-	if (len(gloablConfiguration.TraefikLogsFile) > 0 ){
+
+	if (len(gloablConfiguration.TraefikLogsFile) > 0 ) {
 		fi, err := os.OpenFile(gloablConfiguration.TraefikLogsFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666)
 		if err != nil {
 			log.Fatal("Error opening file", err)
-		}else{
+		}else {
 			logBackend := logging.NewLogBackend(fi, "", 0)
 			logBackendFormatter := logging.NewBackendFormatter(logBackend, logging.GlogFormatter)
 			logBackendLeveled := logging.AddModuleLevel(logBackend)
@@ -51,7 +52,7 @@ func main() {
 			backends = append(backends, logBackendFormatter)
 		}
 	}
-	if (gloablConfiguration.TraefikLogsStdout){
+	if (gloablConfiguration.TraefikLogsStdout) {
 		logBackend := logging.NewLogBackend(os.Stdout, "", 0)
 		logBackendFormatter := logging.NewBackendFormatter(logBackend, format)
 		logBackendLeveled := logging.AddModuleLevel(logBackend)
@@ -121,7 +122,7 @@ func main() {
 			break
 		}
 		srv = &graceful.Server{
-			Timeout:          time.Duration(gloablConfiguration.GraceTimeOut) * time.Second,
+			Timeout: time.Duration(gloablConfiguration.GraceTimeOut) * time.Second,
 			NoSignalHandling: true,
 
 			Server: &http.Server{
@@ -131,7 +132,11 @@ func main() {
 		}
 
 		go func() {
-			srv.ListenAndServe()
+			if (len(gloablConfiguration.CertFile) > 0 && len(gloablConfiguration.KeyFile) > 0) {
+				srv.ListenAndServeTLS(gloablConfiguration.CertFile, gloablConfiguration.KeyFile)
+			} else {
+				srv.ListenAndServe()
+			}
 		}()
 		log.Notice("Started")
 		<-srv.StopChan()
@@ -145,13 +150,13 @@ func notFoundHandler(w http.ResponseWriter, r *http.Request) {
 
 func LoadDefaultConfig(gloablConfiguration *GlobalConfiguration) *mux.Router {
 	router := mux.NewRouter()
-	if (len(gloablConfiguration.AccessLogsFile) > 0 ){
+	if (len(gloablConfiguration.AccessLogsFile) > 0 ) {
 		fi, err := os.OpenFile(gloablConfiguration.AccessLogsFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666)
 		if err != nil {
 			log.Fatal("Error opening file", err)
 		}
 		router.NotFoundHandler = handlers.CombinedLoggingHandler(fi, http.HandlerFunc(notFoundHandler))
-	}else{
+	}else {
 		router.NotFoundHandler = http.HandlerFunc(notFoundHandler)
 	}
 	return router
@@ -159,13 +164,13 @@ func LoadDefaultConfig(gloablConfiguration *GlobalConfiguration) *mux.Router {
 
 func LoadConfig(configuration *Configuration, gloablConfiguration *GlobalConfiguration) *mux.Router {
 	router := mux.NewRouter()
-	if (len(gloablConfiguration.AccessLogsFile) > 0 ){
+	if (len(gloablConfiguration.AccessLogsFile) > 0 ) {
 		fi, err := os.OpenFile(gloablConfiguration.AccessLogsFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666)
 		if err != nil {
 			log.Fatal("Error opening file", err)
 		}
 		router.NotFoundHandler = handlers.CombinedLoggingHandler(fi, http.HandlerFunc(notFoundHandler))
-	}else{
+	}else {
 		router.NotFoundHandler = http.HandlerFunc(notFoundHandler)
 	}
 	backends := map[string]http.Handler{}
@@ -193,13 +198,13 @@ func LoadConfig(configuration *Configuration, gloablConfiguration *GlobalConfigu
 			log.Debug("Reusing backend", route.Backend)
 		}
 		for _, muxRoute := range newRoutes {
-			if (len(gloablConfiguration.AccessLogsFile) > 0 ){
+			if (len(gloablConfiguration.AccessLogsFile) > 0 ) {
 				fi, err := os.OpenFile(gloablConfiguration.AccessLogsFile, os.O_RDWR | os.O_CREATE | os.O_APPEND, 0666)
 				if err != nil {
 					log.Fatal("Error opening file", err)
 				}
 				muxRoute.Handler(handlers.CombinedLoggingHandler(fi, backends[route.Backend]))
-			}else{
+			}else {
 				muxRoute.Handler(backends[route.Backend])
 			}
 			err := muxRoute.GetError()