[ARVADOS] created: 1.3.0-2543-g5da31e101

[Git user]

        at  5da31e1010f885e57c616fe0c36778b7535e4ce0 (commit)


commit 5da31e1010f885e57c616fe0c36778b7535e4ce0
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Thu May 7 18:38:56 2020 -0300

    16118: Installs (possibly overwriting a previous one) CA certificate.
    
    This is need because keep-web tries to access the controller using the external
    URL when trying to get the keep services.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/boot/cert.go b/lib/boot/cert.go
index f0797c2ac..e23ffed06 100644
--- a/lib/boot/cert.go
+++ b/lib/boot/cert.go
@@ -42,6 +42,15 @@ func (createCertificates) Run(ctx context.Context, fail func(error), super *Supe
 	if err != nil {
 		return err
 	}
+	// Install Root CA to system config dir
+	err = super.RunProgram(ctx, super.tempdir, nil, nil, "cp", "rootCA.crt", "/usr/local/share/ca-certificates/arvados-boot-ca.crt")
+	if err != nil {
+		return err
+	}
+	err = super.RunProgram(ctx, super.tempdir, nil, nil, "update-ca-certificates")
+	if err != nil {
+		return err
+	}
 	// Generate server key
 	err = super.RunProgram(ctx, super.tempdir, nil, nil, "openssl", "genrsa", "-out", "server.key", "2048")
 	if err != nil {

commit b07264d87d8777c2981696a2f02ea17d74a179e2
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Thu May 7 18:38:08 2020 -0300

    16118: Fixes ExternalURL configs for keep-web & websocket.
    
    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 c444ec300..bc8210e53 100644
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -591,12 +591,13 @@ 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))}
+				svc.ExternalURL = arvados.URL{Scheme: "wss", Host: fmt.Sprintf("%s:%s", super.ListenHost, nextPort(super.ListenHost)), Path: "/websocket"}
 			}
 		}
 		if len(svc.InternalURLs) == 0 {

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


hooks/post-receive
--