[ARVADOS] created: 1.3.0-2354-gef109c816

Git user git at public.arvados.org
Sat Mar 14 14:02:27 UTC 2020


        at  ef109c816015c97809432b48d8110e171ec89cd0 (commit)


commit ef109c816015c97809432b48d8110e171ec89cd0
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Sat Mar 14 11:01:45 2020 -0300

    16029: Fixes Websockets' ExternalURL config on arvados-boot.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 4a4ab4d98..bc2e4256b 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -538,14 +538,17 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 		if svc == &cluster.Services.DispatchCloud && super.ClusterType == "test" {
 			continue
 		}
-		if svc.ExternalURL.Host == "" && (svc == &cluster.Services.Controller ||
-			svc == &cluster.Services.GitHTTP ||
-			svc == &cluster.Services.Keepproxy ||
-			svc == &cluster.Services.WebDAV ||
-			svc == &cluster.Services.WebDAVDownload ||
-			svc == &cluster.Services.Websocket ||
-			svc == &cluster.Services.Workbench1) {
-			svc.ExternalURL = arvados.URL{Scheme: "https", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost))}
+		if svc.ExternalURL.Host == "" {
+			if (svc == &cluster.Services.Controller ||
+				svc == &cluster.Services.GitHTTP ||
+				svc == &cluster.Services.Keepproxy ||
+				svc == &cluster.Services.WebDAV ||
+				svc == &cluster.Services.WebDAVDownload ||
+				svc == &cluster.Services.Workbench1) {
+				svc.ExternalURL = arvados.URL{Scheme: "https", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost))}
+			} else if svc == &cluster.Services.Websocket {
+				svc.ExternalURL = arvados.URL{Scheme: "wss", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost))}
+			}
 		}
 		if len(svc.InternalURLs) == 0 {
 			svc.InternalURLs = map[arvados.URL]arvados.ServiceInstance{

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list