18700: Proxy workbench2 to arvados-server-boot's server.

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 f15b37ae45be96c6e5c37d3bfdf35fd47d248604..a1b401c40744ead441718b9859c95d801d1930b8 100644 (file)
--- 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 c88546da93b53a4d6ca8167bf56b3fd62c8c09d7..126892bc3e3baf1d219a44a7c3894b9fc91b3fc1 100644 (file)
--- 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 25a6f2096dcb87c2b0505da08d65a8968d5c2cce..dd6b3e6bbac4f33faeb5ec522fe0dda09b0446d0 100644 (file)
--- 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;
     }
   }
 }