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 b4650cb7a8cb78e21508dac5f6498b5f87c4c1ae..446b95ca42c61400640a67ed632c492b64f8238a 100644 (file)
--- 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 c1a6775883e2dc47bf5de37f790396b05b6541f9..528c6be8274a145a3e4cd3ad61e7972078f5d6ea 100755 (executable)
--- 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 e610ec158ffc380275ba5619bdc86036061e804d..822ba4981414a40c70737efda6362d1682535e7e 100644 (file)
--- 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 e610ec158ffc380275ba5619bdc86036061e804d..822ba4981414a40c70737efda6362d1682535e7e 100644 (file)
--- 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'