From 0544586ade178c2d63d9786f72875d4d2733a44b Mon Sep 17 00:00:00 2001
From: Simone Gotti <simone.gotti@gmail.com>
Date: Fri, 19 Mar 2021 10:52:32 +0100
Subject: [PATCH] *: call ListenAndServeTLS when tls is enabled in config

---
 internal/services/configstore/configstore.go | 6 +++++-
 internal/services/executor/executor.go       | 6 +++++-
 internal/services/gateway/gateway.go         | 6 +++++-
 internal/services/gitserver/main.go          | 6 +++++-
 internal/services/runservice/runservice.go   | 6 +++++-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/internal/services/configstore/configstore.go b/internal/services/configstore/configstore.go
index 406899e..def9e7b 100644
--- a/internal/services/configstore/configstore.go
+++ b/internal/services/configstore/configstore.go
@@ -397,7 +397,11 @@ func (s *Configstore) run(ctx context.Context) error {
 
 	lerrCh := make(chan error, 1)
 	util.GoWait(&wg, func() {
-		lerrCh <- httpServer.ListenAndServe()
+		if !s.c.Web.TLS {
+			lerrCh <- httpServer.ListenAndServe()
+		} else {
+			lerrCh <- httpServer.ListenAndServeTLS("", "")
+		}
 	})
 	defer httpServer.Close()
 
diff --git a/internal/services/executor/executor.go b/internal/services/executor/executor.go
index ca46a69..c350f94 100644
--- a/internal/services/executor/executor.go
+++ b/internal/services/executor/executor.go
@@ -1475,7 +1475,11 @@ func (e *Executor) Run(ctx context.Context) error {
 	}
 	lerrCh := make(chan error)
 	go func() {
-		lerrCh <- httpServer.ListenAndServe()
+		if !e.c.Web.TLS {
+			lerrCh <- httpServer.ListenAndServe()
+		} else {
+			lerrCh <- httpServer.ListenAndServeTLS("", "")
+		}
 	}()
 
 	select {
diff --git a/internal/services/gateway/gateway.go b/internal/services/gateway/gateway.go
index 657d92a..c1048e2 100644
--- a/internal/services/gateway/gateway.go
+++ b/internal/services/gateway/gateway.go
@@ -350,7 +350,11 @@ func (g *Gateway) Run(ctx context.Context) error {
 
 	lerrCh := make(chan error)
 	go func() {
-		lerrCh <- httpServer.ListenAndServe()
+		if !g.c.Web.TLS {
+			lerrCh <- httpServer.ListenAndServe()
+		} else {
+			lerrCh <- httpServer.ListenAndServeTLS("", "")
+		}
 	}()
 
 	select {
diff --git a/internal/services/gitserver/main.go b/internal/services/gitserver/main.go
index 23f6858..03d6ce8 100644
--- a/internal/services/gitserver/main.go
+++ b/internal/services/gitserver/main.go
@@ -172,7 +172,11 @@ func (s *Gitserver) Run(ctx context.Context) error {
 
 	lerrCh := make(chan error)
 	go func() {
-		lerrCh <- httpServer.ListenAndServe()
+		if !s.c.Web.TLS {
+			lerrCh <- httpServer.ListenAndServe()
+		} else {
+			lerrCh <- httpServer.ListenAndServeTLS("", "")
+		}
 	}()
 
 	select {
diff --git a/internal/services/runservice/runservice.go b/internal/services/runservice/runservice.go
index 9805afa..09e504d 100644
--- a/internal/services/runservice/runservice.go
+++ b/internal/services/runservice/runservice.go
@@ -403,7 +403,11 @@ func (s *Runservice) run(ctx context.Context) error {
 
 	lerrCh := make(chan error, 1)
 	util.GoWait(&wg, func() {
-		lerrCh <- httpServer.ListenAndServe()
+		if !s.c.Web.TLS {
+			lerrCh <- httpServer.ListenAndServe()
+		} else {
+			lerrCh <- httpServer.ListenAndServeTLS("", "")
+		}
 	})
 
 	select {