From 904b0ae1bba10265661f680dba926d57ba3d8ec7 Mon Sep 17 00:00:00 2001 From: Sergey Stepanov Date: Thu, 26 Aug 2021 14:39:17 +0300 Subject: [PATCH] Set coordinator server address to :http for cloudretro --- .../workflows/cd/cloudretro.io/coordinator.env | 1 + pkg/network/httpx/server.go | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cd/cloudretro.io/coordinator.env b/.github/workflows/cd/cloudretro.io/coordinator.env index 5b2388b8..40da39b9 100644 --- a/.github/workflows/cd/cloudretro.io/coordinator.env +++ b/.github/workflows/cd/cloudretro.io/coordinator.env @@ -1,3 +1,4 @@ +CLOUD_GAME_COORDINATOR_SERVER_ADDRESS= CLOUD_GAME_COORDINATOR_SERVER_HTTPS=true CLOUD_GAME_COORDINATOR_SERVER_TLS_DOMAIN=cloudretro.io CLOUD_GAME_ENVIRONMENT=prod diff --git a/pkg/network/httpx/server.go b/pkg/network/httpx/server.go index ac2244c8..24cbd4b3 100644 --- a/pkg/network/httpx/server.go +++ b/pkg/network/httpx/server.go @@ -117,15 +117,15 @@ func (s *Server) GetProtocol() string { } func (s *Server) redirection() (*Server, error) { + address := s.Addr + if s.opts.HttpsDomain != "" { + address = s.opts.HttpsDomain + } + addr := buildAddress(address, s.opts.Zone, *s.listener) + srv, err := NewServer(s.opts.HttpsRedirectAddress, func(serv *Server) http.Handler { h := http.NewServeMux() - address := s.Addr - if s.opts.HttpsDomain != "" { - address = s.opts.HttpsDomain - } - addr := buildAddress(address, s.opts.Zone, *s.listener) - h.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { httpsURL := url.URL{Scheme: "https", Host: addr, Path: r.URL.Path, RawQuery: r.URL.RawQuery} rdr := httpsURL.String() @@ -137,9 +137,8 @@ func (s *Server) redirection() (*Server, error) { if serv.autoCert != nil { return serv.autoCert.HTTPHandler(h) } - return h }) - log.Printf("Starting HTTP->HTTPS redirection server on %s", srv.Addr) + log.Printf("Starting HTTP->HTTPS redirection server on %s", addr) return srv, err }