[ARVADOS] updated: 1.3.0-2544-ga20c1480b

Git user git at public.arvados.org
Tue May 12 12:47:36 UTC 2020


Summary of changes:
 lib/boot/supervisor.go | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

       via  a20c1480b7ed827d02511d1630e0894696814107 (commit)
      from  7e16d43dd62c05c0b150d1980cab5067ed18e128 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a20c1480b7ed827d02511d1630e0894696814107
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue May 12 09:46:40 2020 -0300

    16118: Set URL path to '/' to all services instead of just keep-web.
    
    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 bc8210e53..ec0a9111a 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -591,10 +591,9 @@ func (super *Supervisor) autofillConfig(cfg *arvados.Config) error {
 				svc == &cluster.Services.GitHTTP ||
 				svc == &cluster.Services.Health ||
 				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.WebDAV ||
-				svc == &cluster.Services.WebDAVDownload {
 				svc.ExternalURL = arvados.URL{Scheme: "https", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost)), Path: "/"}
 			} else if svc == &cluster.Services.Websocket {
 				svc.ExternalURL = arvados.URL{Scheme: "wss", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost)), Path: "/websocket"}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list