20688: Reorder redirects by priority

[arvados.git] / tools / salt-install / config_examples / multi_host / aws / pillars / nginx_workbench2_configuration.sls

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 44b3fb16753395fdfa1160ecafb97f9bab2d1b04..72cdf0484b3d6d7c51462dbd3b92ca7cc5d69f1e 100644 (file)
--- 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'