Skip to content

Commit

Permalink
Enable path-based interactive tools
Browse files Browse the repository at this point in the history
  • Loading branch information
kysrpex committed Jul 11, 2024
1 parent 9065358 commit 10c8d8a
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions group_vars/sn06.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions group_vars/sn07.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion templates/nginx/galaxy-ie-main.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions templates/nginx/galaxy-main.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 10c8d8a

Please sign in to comment.