[arvados] updated: 2.7.0-5607-g17f3f80dda

git repository hosting git at public.arvados.org
Thu Dec 14 15:27:51 UTC 2023


Summary of changes:
 tools/arvbox/lib/arvbox/docker/service/nginx/run | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

       via  17f3f80dda9d09c68ef5642a3ff9f7ef67de69f9 (commit)
      from  3a9ad31ae91ff7de3ba1e4eddebea98ef4b7a672 (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 17f3f80dda9d09c68ef5642a3ff9f7ef67de69f9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Sep 1 17:20:32 2023 -0400

    Fix arvbox wb1 to wb2 redirects refs #20850
    
    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 e92870c3ee..c1a6775883 100755
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run
@@ -123,17 +123,17 @@ http {
     # 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;
+    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;
+      rewrite ^/collections/([^/]*)/(.*) /?redirectToDownload=/c=\$1/\$2? redirect;
     }
     if (\$arg_disposition = inline) {
-      rewrite ^/collections/([^/]*)/(.*) /?redirectToPreview=/c=$1/$2? redirect;
+      rewrite ^/collections/([^/]*)/(.*) /?redirectToPreview=/c=\$1/\$2? redirect;
     }
 
     # Redirects that go to a roughly equivalent page

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list