dashboard.go Simplified HTTPS code

server/dashboard.go

@@ -71,36 +71,27 @@ func (svr *Service) RunDashboardServer(address string) (err error) {
 		http.Redirect(w, r, "/static/", http.StatusMovedPermanently)
 	})
 
-	if svr.cfg.DashboardTLSMode {
-		cer, err := tls.LoadX509KeyPair(svr.cfg.DashboardTLSCertFile, svr.cfg.DashboardTLSKeyFile)
-		if err != nil {
-			return err
-		}
-		cfg := &tls.Config{
-			Certificates: []tls.Certificate{cer},
-		}
-		server := &http.Server{
-			Addr:         address,
-			Handler:      router,
-			TLSConfig:    cfg,
-			TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler), 0),
-		}
-		go server.ListenAndServeTLS("", "")
-	} else {
-		server := &http.Server{
-			Addr:         address,
-			Handler:      router,
-			ReadTimeout:  httpServerReadTimeout,
-			WriteTimeout: httpServerWriteTimeout,
-		}
-		if address == "" || address == ":" {
-			address = ":http"
-		}
-		ln, err := net.Listen("tcp", address)
-		if err != nil {
-			return err
-		}
-		go server.Serve(ln)
+	server := &http.Server{
+		Addr:         address,
+		Handler:      router,
+		ReadTimeout:  httpServerReadTimeout,
+		WriteTimeout: httpServerWriteTimeout,
 	}
+	ln, err := net.Listen("tcp", address)
+	if err != nil {
+		return err
+	}
+
+	if svr.cfg.DashboardTLSMode {
+		cert, err := tls.LoadX509KeyPair(svr.cfg.DashboardTLSCertFile, svr.cfg.DashboardTLSKeyFile)
+		if err != nil {
+			return err
+		}
+		tlsCfg := &tls.Config{
+			Certificates: []tls.Certificate{cert},
+		}
+		ln = tls.NewListener(ln, tlsCfg)
+	}
+	go server.Serve(ln)
 	return
 }