20688: Reorder redirects by priority

[arvados.git] / tools / arvbox / lib / arvbox / docker / service / nginx / run

diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run b/tools/arvbox/lib/arvbox/docker/service/nginx/run
index ec889e7dd9d173b668fe190b75be446504fa1de7..e92870c3eef9b8ff1741fbe7accd11ff9ea75ee1 100755 (executable)
--- 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;