From c3ca6b26238a510f6a8e6a91b1a725311a742cad Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 12 Apr 2022 11:01:10 -0400 Subject: [PATCH] 18700: Renumber default/example ports to 9000-9020 and 4440-4460. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/install.go | 3 ++- lib/install/init.go | 42 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go index a1b401c407..0de99cabd2 100644 --- a/cmd/arvados-package/install.go +++ b/cmd/arvados-package/install.go @@ -92,7 +92,8 @@ rm /etc/apt/sources.list.d/arvados-local.list cmd.Args = append(cmd.Args, "--env=domain="+opts.Live, "--env=bootargs=", - "--publish=:4430-4450:4430-4450", + "--publish=:4440-4460:4440-4460", + "--publish=:9000-9020:9000-9020", "--add-host="+opts.Live+":0.0.0.0", "--volume=/var/lib/acme:/var/lib/acme:ro") } else { diff --git a/lib/install/init.go b/lib/install/init.go index 126892bc3e..07c0dc1ed5 100644 --- a/lib/install/init.go +++ b/lib/install/init.go @@ -106,53 +106,53 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read Services: Controller: InternalURLs: - "http://0.0.0.0:8003/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4430/" ) }} + "http://0.0.0.0:9000/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4440/" ) }} RailsAPI: InternalURLs: - "http://0.0.0.0:8004/": {} + "http://0.0.0.0:9001/": {} Websocket: InternalURLs: - "http://0.0.0.0:8005/": {} - ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4435/websocket" ) }} + "http://0.0.0.0:9004/": {} + ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4444/websocket" ) }} Keepbalance: InternalURLs: - "http://0.0.0.0:9005/": {} + "http://0.0.0.0:9019/": {} GitHTTP: InternalURLs: - "http://0.0.0.0:9001/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4436/" ) }} + "http://0.0.0.0:9005/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4445/" ) }} DispatchCloud: InternalURLs: "http://0.0.0.0:9006/": {} Keepproxy: InternalURLs: - "http://0.0.0.0:25108/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4437/" ) }} + "http://0.0.0.0:9007/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4447/" ) }} WebDAV: InternalURLs: - "http://0.0.0.0:9002/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4438/" ) }} + "http://0.0.0.0:9008/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4448/" ) }} WebDAVDownload: InternalURLs: - "http://0.0.0.0:8004/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4439/" ) }} + "http://0.0.0.0:9009/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4449/" ) }} Keepstore: InternalURLs: - "http://0.0.0.0:25107/": {} + "http://0.0.0.0:9010/": {} Composer: - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4440/composer" ) }} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4459/composer" ) }} Workbench1: InternalURLs: - "http://0.0.0.0:8001/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4441/" ) }} + "http://0.0.0.0:9002/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }} Workbench2: InternalURLs: - "http://0.0.0.0:8002/": {} - ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }} + "http://0.0.0.0:9003/": {} + ExternalURL: {{printf "%q" ( print "https://" .Domain ":4443/" ) }} Health: InternalURLs: - "http://0.0.0.0:9007/": {} + "http://0.0.0.0:9011/": {} Collections: BlobSigningKey: {{printf "%q" ( .RandomHex 50 )}} {{if .Insecure}} -- 2.30.2