From cd0932600f5701f2d01bc28d9f79c77de0e8ee76 Mon Sep 17 00:00:00 2001 From: Peter van Heusden Date: Sat, 25 Jun 2016 23:26:24 +0200 Subject: [PATCH] Modified Apache/nginx settings suggestions --- doc/source/admin/interactive_environments.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/source/admin/interactive_environments.rst b/doc/source/admin/interactive_environments.rst index 40d0ace91af..ba2aeabb5bb 100644 --- a/doc/source/admin/interactive_environments.rst +++ b/doc/source/admin/interactive_environments.rst @@ -158,7 +158,7 @@ accordingly. .. code-block:: apache # Project Jupyter specific. Other IEs may require their own routes. - ProxyPass /galaxy/gie_proxy/ipython/api/kernels ws://localhost:8800/galaxy/gie_proxy/ipython/api/kernels + ProxyPass /galaxy/gie_proxy/jupyter/ipython/api/kernels ws://localhost:8800/galaxy/gie_proxy/jupyter/ipython/api/kernels # Global GIE configuration ProxyPass /galaxy/gie_proxy http://localhost:8800/galaxy/gie_proxy @@ -181,8 +181,8 @@ Please note you will need to be using apache2.4 with ``mod_proxy_wstunnel``. } # Project Jupyter / IPython specific. Other IEs may require their own routes. - location /galaxy/gie_proxy/ipython/api/kernels { - proxy_pass http://localhost:8800/galaxy/gie_proxy/ipython/api/kernels; + location ~ ^/galaxy/gie_proxy/jupyter/(?[^/]+)/api/kernels(?.*?)$ { + proxy_pass http://localhost:8800/galaxy/gie_proxy/$nbtype/api/kernels$rest; proxy_redirect off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade;