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 0de99cabd20489927243358a11cf9648a40e7801..6b6113b9522fb754e6dc8bc5454dc07add29ac25 100644 (file)
--- 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 07c0dc1ed509228cd6dcc05d463995b423bd6e53..6a52441d716a2781beb53aa6d2a67004e166a7ea 100644 (file)
--- 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/": {}