[arvados] updated: 2.6.0-381-gfe8e94087
git repository hosting
git at public.arvados.org
Wed Aug 2 21:18:50 UTC 2023
Summary of changes:
tools/arvbox/lib/arvbox/docker/service/nginx/run | 54 +++++++++++-----------
.../aws/pillars/nginx_workbench2_configuration.sls | 53 +++++++++++----------
2 files changed, 53 insertions(+), 54 deletions(-)
via fe8e9408735f65f0896b4ff415a9e4540d180eaf (commit)
from 87eca9e6910859e5f3bf470f896bbf8d039db46e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit fe8e9408735f65f0896b4ff415a9e4540d180eaf
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Wed Aug 2 17:18:32 2023 -0400
20688: Reorder redirects by priority
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run b/tools/arvbox/lib/arvbox/docker/service/nginx/run
index ec889e7dd..e92870c3e 100755
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run
@@ -122,6 +122,33 @@ http {
# rewrite ^/projects.* /projects redirect;
# rewrite ^/trash /trash redirect;
+ # Redirects that include a uuid
+ rewrite ^/work_units/(.*) /processes/$1 redirect;
+ rewrite ^/container_requests/(.*) /processes/$1 redirect;
+ rewrite ^/users/(.*) /user/$1 redirect;
+ rewrite ^/groups/(.*) /group/$1 redirect;
+
+ # Special file download redirects
+ if (\$arg_disposition = attachment) {
+ rewrite ^/collections/([^/]*)/(.*) /?redirectToDownload=/c=$1/$2? redirect;
+ }
+ if (\$arg_disposition = inline) {
+ rewrite ^/collections/([^/]*)/(.*) /?redirectToPreview=/c=$1/$2? redirect;
+ }
+
+ # Redirects that go to a roughly equivalent page
+ rewrite ^/virtual_machines.* /virtual-machines-admin redirect;
+ rewrite ^/users/.*/virtual_machines /virtual-machines-user redirect;
+ rewrite ^/authorized_keys.* /ssh-keys-admin redirect;
+ rewrite ^/users/.*/ssh_keys /ssh-keys-user redirect;
+ rewrite ^/containers.* /all_processes redirect;
+ rewrite ^/container_requests /all_processes redirect;
+ rewrite ^/job.* /all_processes redirect;
+ rewrite ^/users/link_account /link_account redirect;
+ rewrite ^/search.* /search-results redirect;
+ rewrite ^/keep_services.* /keep-services redirect;
+ rewrite ^/trash_items.* /trash redirect;
+
# Redirects that don't have a good mapping and
# just go to root.
rewrite ^/themes.* / redirect;
@@ -141,33 +168,6 @@ http {
rewrite ^/pipeline_templates.* / redirect;
rewrite ^/pipeline_instances.* / redirect;
- # Redirects that go to a roughly equivalent page
- rewrite ^/virtual_machines.* /virtual-machines-admin redirect;
- rewrite ^/users/.*/virtual_machines /virtual-machines-user redirect;
- rewrite ^/authorized_keys.* /ssh-keys-admin redirect;
- rewrite ^/users/.*/ssh_keys /ssh-keys-user redirect;
- rewrite ^/containers.* /all_processes redirect;
- rewrite ^/container_requests /all_processes redirect;
- rewrite ^/job.* /all_processes redirect;
- rewrite ^/users/link_account /link_account redirect;
- rewrite ^/search.* /search-results redirect;
- rewrite ^/keep_services.* /keep-services redirect;
- rewrite ^/trash_items.* /trash redirect;
-
- # Redirects that include a uuid
- rewrite ^/work_units/(.*) /processes/$1 redirect;
- rewrite ^/container_requests/(.*) /processes/$1 redirect;
- rewrite ^/users/(.*) /user/$1 redirect;
- rewrite ^/groups/(.*) /group/$1 redirect;
-
- # Special file download redirects
- if (\$arg_disposition = attachment) {
- rewrite ^/collections/([^/]*)/(.*) /?redirectToDownload=/c=$1/$2? redirect;
- }
- if (\$arg_disposition = inline) {
- rewrite ^/collections/([^/]*)/(.*) /?redirectToPreview=/c=$1/$2? redirect;
- }
-
location / {
proxy_pass http://workbench2;
proxy_set_header Host \$http_host;
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench2_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench2_configuration.sls
index 44b3fb167..72cdf0484 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench2_configuration.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench2_configuration.sls
@@ -49,6 +49,32 @@ nginx:
# rewrite ^/projects.* /projects redirect;
# rewrite ^/trash /trash redirect;
+ # Redirects that include a uuid
+ - rewrite: '^/work_units/(.*) /processes/$1 redirect'
+ - rewrite: '^/container_requests/(.*) /processes/$1 redirect'
+ - rewrite: '^/users/(.*) /user/$1 redirect'
+ - rewrite: '^/groups/(.*) /group/$1 redirect'
+
+ # Special file download redirects
+ - 'if ($arg_disposition = attachment)':
+ - rewrite: '^/collections/([^/]*)/(.*) /?redirectToDownload=/c=$1/$2? redirect'
+
+ - 'if ($arg_disposition = inline)':
+ - rewrite: '^/collections/([^/]*)/(.*) /?redirectToPreview=/c=$1/$2? redirect'
+
+ # Redirects that go to a roughly equivalent page
+ - rewrite: '^/virtual_machines.* /virtual-machines-admin redirect'
+ - rewrite: '^/users/.*/virtual_machines /virtual-machines-user redirect'
+ - rewrite: '^/authorized_keys.* /ssh-keys-admin redirect'
+ - rewrite: '^/users/.*/ssh_keys /ssh-keys-user redirect'
+ - rewrite: '^/containers.* /all_processes redirect'
+ - rewrite: '^/container_requests /all_processes redirect'
+ - rewrite: '^/job.* /all_processes redirect'
+ - rewrite: '^/users/link_account /link_account redirect'
+ - rewrite: '^/search.* /search-results redirect'
+ - rewrite: '^/keep_services.* /keep-services redirect'
+ - rewrite: '^/trash_items.* /trash redirect'
+
# Redirects that don't have a good mapping and
# just go to root.
- rewrite: '^/themes.* / redirect'
@@ -68,33 +94,6 @@ nginx:
- rewrite: '^/pipeline_templates.* / redirect'
- rewrite: '^/pipeline_instances.* / redirect'
- # Redirects that go to a roughly equivalent page
- - rewrite: '^/virtual_machines.* /virtual-machines-admin redirect'
- - rewrite: '^/users/.*/virtual_machines /virtual-machines-user redirect'
- - rewrite: '^/authorized_keys.* /ssh-keys-admin redirect'
- - rewrite: '^/users/.*/ssh_keys /ssh-keys-user redirect'
- - rewrite: '^/containers.* /all_processes redirect'
- - rewrite: '^/container_requests /all_processes redirect'
- - rewrite: '^/job.* /all_processes redirect'
- - rewrite: '^/users/link_account /link_account redirect'
- - rewrite: '^/search.* /search-results redirect'
- - rewrite: '^/keep_services.* /keep-services redirect'
- - rewrite: '^/trash_items.* /trash redirect'
-
- # Redirects that include a uuid
- - rewrite: '^/work_units/(.*) /processes/$1 redirect'
- - rewrite: '^/container_requests/(.*) /processes/$1 redirect'
- - rewrite: '^/users/(.*) /user/$1 redirect'
- - rewrite: '^/groups/(.*) /group/$1 redirect'
-
- # Special file download redirects
- - 'if ($arg_disposition = attachment)':
- - rewrite: '^/collections/([^/]*)/(.*) /?redirectToDownload=/c=$1/$2? redirect'
-
- - 'if ($arg_disposition = inline)':
- - rewrite: '^/collections/([^/]*)/(.*) /?redirectToPreview=/c=$1/$2? redirect'
-
-
- location /:
- root: /var/www/arvados-workbench2/workbench2
- try_files: '$uri $uri/ /index.html'
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list