diff --git a/group_vars/sn06.yml b/group_vars/sn06.yml index 5ac37da52..13e372d0e 100644 --- a/group_vars/sn06.yml +++ b/group_vars/sn06.yml @@ -233,6 +233,7 @@ gie_proxy_nodejs_version: "10.13.0" gie_proxy_virtualenv: "{{ galaxy_root }}/gie-proxy/venv" gie_proxy_setup_service: systemd gie_proxy_sessions_path: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite" +gie_proxy_path_prefix: /interactivetool/ep gie_proxy_port: 8800 gie_proxy_verbose: true diff --git a/group_vars/sn07.yml b/group_vars/sn07.yml index 3eac16461..6acea1d96 100644 --- a/group_vars/sn07.yml +++ b/group_vars/sn07.yml @@ -287,6 +287,7 @@ gie_proxy_nodejs_version: "10.13.0" gie_proxy_virtualenv: "{{ galaxy_root }}/gie-proxy/venv" gie_proxy_setup_service: systemd gie_proxy_sessions_path: "{{ galaxy_mutable_data_dir }}/interactivetools_map.sqlite" +gie_proxy_path_prefix: /interactivetool/ep gie_proxy_port: 8800 gie_proxy_verbose: true diff --git a/templates/nginx/galaxy-ie-main.j2 b/templates/nginx/galaxy-ie-main.j2 index 6205f276b..eb62a5827 100644 --- a/templates/nginx/galaxy-ie-main.j2 +++ b/templates/nginx/galaxy-ie-main.j2 @@ -17,7 +17,7 @@ server { access_log /var/log/nginx/interactive.log; location / { - proxy_pass http://127.0.0.1:8800; + proxy_pass http://127.0.0.1:{{ gie_proxy_port }}; proxy_redirect off; proxy_http_version 1.1; proxy_set_header Host $host; diff --git a/templates/nginx/galaxy-main.j2 b/templates/nginx/galaxy-main.j2 index 75c2fc016..9fba5191c 100644 --- a/templates/nginx/galaxy-main.j2 +++ b/templates/nginx/galaxy-main.j2 @@ -181,6 +181,16 @@ server { proxy_set_header Connection "upgrade"; } + # Route all path-based interactive tool requests to the InteractiveTool proxy application + location ~* ^/(interactivetool/.+)$ { + proxy_redirect off; + proxy_http_version 1.1; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_pass http://127.0.0.1:{{ gie_proxy_port }}; + } location /.well-known/ { proxy_set_header Host $host:$server_port;