a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #261 from sgotti/add_listenandservetls 

*: call ListenAndServeTLS when tls is enabled in config
This commit is contained in:
Simone Gotti 2021-03-19 12:25:07 +01:00 committed by GitHub
parent 291ed3d440 0544586ade
commit 43d73ec064
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/services/configstore/configstore.go
View File

@ -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()

6
internal/services/executor/executor.go
View File

@ -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 {

6
internal/services/gateway/gateway.go
View File

@ -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 {

6
internal/services/gitserver/main.go
View File

@ -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 {

6
internal/services/runservice/runservice.go
View File

@ -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 {