Skip to content

Update galaxy.j2 #1977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cat-bro wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update galaxy.j2 #1977

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 1 addition & 26 deletions templates/nginx/galaxy.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,31 +140,6 @@ server {
proxy_pass http://localhost:{{ galaxy_tusd_port }}/files;
}

{% if galaxy_config['galaxy']['nginx_upload_store'] is defined %}

location /_upload {
upload_store {{ galaxy_config['galaxy']['nginx_upload_store'] }};
upload_limit_rate "{{ nginx_upload_limit_rate|d(0) }}";
upload_store_access user:rw group:r all:r;
upload_pass_form_field "";
upload_set_form_field "__${upload_field_name}__is_composite" "true";
upload_set_form_field "__${upload_field_name}__keys" "name path";
upload_set_form_field "${upload_field_name}_name" "$upload_file_name";
upload_set_form_field "${upload_field_name}_path" "$upload_tmp_path";
upload_pass_args on;
upload_buffer_size 4M;
upload_pass /_upload_done;
}

location /_upload_done {
set $dst /api/tools;
if ($args ~ nginx_redir=([^&]+)) {
set $dst $1;
}
rewrite "" $dst;
}

{% endif %}
{% if galaxy_config['galaxy']['nginx_upload_job_files_store'] is defined %}

location /_job_files {
Expand All @@ -177,7 +152,7 @@ server {
upload_pass_form_field "";
upload_set_form_field "__${upload_field_name}_path" "$upload_tmp_path";
upload_pass_args on;
upload_buffer_size 4M;
upload_buffer_size 16M;
upload_pass /_upload_job_files_done;
}

Expand Down