X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fc55e48b43faeb6909ea161d804d5600df3d5c5c..b7d5f7b673fd35ef6eb7348a9a96ba100995427f:/tools/salt-install/config_examples/multi_host/aws/pillars/nginx_workbench_configuration.sls 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 87ed7c4507..e610ec158f 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 @@ -33,6 +33,16 @@ nginx: requires: __CERT_REQUIRES__ config: + # Maps WB1 '/actions?uuid=X' URLs to their equivalent on WB2 + - 'map $request_uri $actions_redirect': + - '~^/actions\?uuid=(.*-4zz18-.*)': '/collections/$1' + - '~^/actions\?uuid=(.*-j7d0g-.*)': '/projects/$1' + - '~^/actions\?uuid=(.*-tpzed-.*)': '/projects/$1' + - '~^/actions\?uuid=(.*-7fd4e-.*)': '/workflows/$1' + - '~^/actions\?uuid=(.*-xvhdp-.*)': '/processes/$1' + - '~^/actions\?uuid=(.*)': '/' + - default: 0 + - server: - server_name: workbench.__DOMAIN__ - listen: @@ -49,6 +59,10 @@ nginx: # rewrite ^/projects.* /projects redirect; # rewrite ^/trash /trash redirect; + # WB1 '/actions?uuid=X' URL Redirects + - 'if ($actions_redirect)': + - return: '301 $actions_redirect' + # Redirects that include a uuid - rewrite: '^/work_units/(.*) /processes/$1 redirect' - rewrite: '^/container_requests/(.*) /processes/$1 redirect'