From 35413d295c268b7776be2b2382e8872dc5cd1eff Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Tue, 12 Apr 2022 00:17:22 -0400 Subject: [PATCH] 18700: Proxy workbench2 to arvados-server-boot's server. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/install.go | 2 +- lib/install/init.go | 2 ++ sdk/python/tests/nginx.conf | 14 ++++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go index f15b37ae45..a1b401c407 100644 --- a/cmd/arvados-package/install.go +++ b/cmd/arvados-package/install.go @@ -120,7 +120,7 @@ SUDO_FORCE_REMOVE=yes apt-get autoremove -y /etc/init.d/postgresql start arvados-server init -cluster-id x1234 -domain=$domain -login=test -insecure -exec arvados-server boot -listen-host=0.0.0.0 $bootargs +exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs `) cmd.Stdout = stdout cmd.Stderr = stderr diff --git a/lib/install/init.go b/lib/install/init.go index c88546da93..126892bc3e 100644 --- a/lib/install/init.go +++ b/lib/install/init.go @@ -147,6 +147,8 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read "http://0.0.0.0:8001/": {} ExternalURL: {{printf "%q" ( print "https://" .Domain ":4441/" ) }} Workbench2: + InternalURLs: + "http://0.0.0.0:8002/": {} ExternalURL: {{printf "%q" ( print "https://" .Domain ":4442/" ) }} Health: InternalURLs: diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf index 25a6f2096d..dd6b3e6bba 100644 --- a/sdk/python/tests/nginx.conf +++ b/sdk/python/tests/nginx.conf @@ -157,18 +157,20 @@ http { proxy_redirect off; } } + upstream workbench2 { + server {{LISTENHOST}}:{{WORKBENCH2PORT}}; + } server { listen {{LISTENHOST}}:{{WORKBENCH2SSLPORT}} ssl; server_name workbench2 workbench2.*; ssl_certificate "{{SSLCERT}}"; ssl_certificate_key "{{SSLKEY}}"; - location /config.json { - return 200 '{ "API_HOST": "{{ARVADOS_API_HOST}}" }'; - } location / { - root /var/lib/arvados/workbench2; - index index.html; - try_files $uri $uri/ /index.html; + proxy_pass http://workbench2; + proxy_set_header Host $http_host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto https; + proxy_redirect off; } } } -- 2.30.2