Merge branch 'master' into 15319-api-useful-stacktraces

[arvados.git] / tools / arvbox / lib / arvbox / docker / service / workbench / run

diff --git a/tools/arvbox/lib/arvbox/docker/service/workbench/run b/tools/arvbox/lib/arvbox/docker/service/workbench/run
index d90a2e2f8170d9d8d5960b69ba903822538a0ce0..e163493781f1a16531dc7bb355137aed941843fa 100755 (executable)
--- a/tools/arvbox/lib/arvbox/docker/service/workbench/run
+++ b/tools/arvbox/lib/arvbox/docker/service/workbench/run
@@ -22,6 +22,9 @@ else
 fi
 
 if test "$1" != "--only-deps" ; then
-    exec bundle exec passenger start --port 80 \
-         --user arvbox --runtime-dir=/var/lib/passenger
+    openssl verify -CAfile $root_cert $server_cert
+    exec bundle exec passenger start --port=${services[workbench]} \
+        --ssl --ssl-certificate=/var/lib/arvados/server-cert-${localip}.pem \
+        --ssl-certificate-key=/var/lib/arvados/server-cert-${localip}.key \
+         --user arvbox
 fi