16118: Set URL path to '/' to all services instead of just keep-web.
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Tue, 12 May 2020 12:46:40 +0000 (09:46 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Tue, 12 May 2020 12:46:40 +0000 (09:46 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

lib/boot/supervisor.go

index bc8210e5392469f32a805808818219e2d14295d7..ec0a9111a8392273a4e0d6c6355940c99328a121 100644 (file)
@@ -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"}