From: Peter Amstutz <peter.amstutz@curii.com>
Date: Wed, 3 Jan 2024 19:40:28 +0000 (-0500)
Subject: 21278: Remove the '/search.*' to '/search-results' redirect
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a22d01b7133be84a38914ab98a19d4e5aba07d50?hp=a6b9fb8166440eef3144150024a875c858db9bb6

21278: Remove the '/search.*' to '/search-results' redirect

It produces an infinite loop and I don't think the /search endpoint is
really compatible with the /search-results endpoint anyway, and it's
less likely for people to have old hyperlinks to search results than
to projects or collections.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index b4650cb7a8..446b95ca42 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -185,7 +185,6 @@ http {
     ^/container_requests           /all_processes;
     ^/job.*                        /all_processes;
     ^/users/link_account           /link_account;
-    ^/search.*                     /search-results;
     ^/keep_services.*              /keep-services;
     ^/trash_items.*                /trash;
 
diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run b/tools/arvbox/lib/arvbox/docker/service/nginx/run
index c1a6775883..528c6be827 100755
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run
@@ -145,7 +145,6 @@ http {
     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;
 
diff --git a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls
index e610ec158f..822ba49814 100644
--- a/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls
+++ b/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls
@@ -85,7 +85,6 @@ nginx:
             - 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'
 
diff --git a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_workbench_configuration.sls b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_workbench_configuration.sls
index e610ec158f..822ba49814 100644
--- a/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_workbench_configuration.sls
+++ b/tools/salt-install/config_examples/single_host/multiple_hostnames/pillars/nginx_workbench_configuration.sls
@@ -85,7 +85,6 @@ nginx:
             - 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'