From: Tom Clegg <tom@curii.com>
Date: Tue, 12 Apr 2022 16:02:38 +0000 (-0400)
Subject: 18700: Default to domain:443 for workbench2 ExternalURL.
X-Git-Tag: 2.5.0~214^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/66a90e37d9dbc9a6526a7de2a2d0b286e8e6f87f

18700: Default to domain:443 for workbench2 ExternalURL.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 0de99cabd2..6b6113b952 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -92,6 +92,7 @@ rm /etc/apt/sources.list.d/arvados-local.list
 		cmd.Args = append(cmd.Args,
 			"--env=domain="+opts.Live,
 			"--env=bootargs=",
+			"--publish=:443:443",
 			"--publish=:4440-4460:4440-4460",
 			"--publish=:9000-9020:9000-9020",
 			"--add-host="+opts.Live+":0.0.0.0",
diff --git a/lib/install/init.go b/lib/install/init.go
index 07c0dc1ed5..6a52441d71 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -149,7 +149,7 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
       Workbench2:
         InternalURLs:
           "http://0.0.0.0:9003/": {}
-        ExternalURL: {{printf "%q" ( print "https://" .Domain ":4443/" ) }}
+        ExternalURL: {{printf "%q" ( print "https://" .Domain "/" ) }}
       Health:
         InternalURLs:
           "http://0.0.0.0:9011/": {}