From feb93635ef0385e98f808acfe5fb6f8d5682f4c8 Mon Sep 17 00:00:00 2001 From: "antoine.phan@mail.mcgill.ca" Date: Fri, 9 May 2025 13:00:57 -0400 Subject: [PATCH 1/2] Add redirect 301 rule on `nginx` & minor formatting for consistency --- nginx/vim.conf.template | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/nginx/vim.conf.template b/nginx/vim.conf.template index c40b7a60..b23116ad 100644 --- a/nginx/vim.conf.template +++ b/nginx/vim.conf.template @@ -1,13 +1,22 @@ - upstream vim-app { - # define the vim-app upstream server - server vim-app:8001 fail_timeout=0; - } +upstream vim-app { + # define the vim-app upstream server + server vim-app:8001 fail_timeout=0; +} - server { - # if no host match, close connection - listen 80 default_server; - return 444; - } +server { + # if no host match, close connection + listen 80 default_server; + return 444; +} + +server { + listen 80; + client_max_body_size 4G; + server_name vim.staging.simssa.ca; + + // Nginx docs: https://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri ($scheme is right below it) + return 301 $scheme:${HOST_NAME}$request_uri; +} server { @@ -26,4 +35,4 @@ server { proxy_pass http://vim-app; # proxy request to vim-app upstream server } -} \ No newline at end of file +} From 0c189f3300d2c67553bd7f5b5ed95334d931392b Mon Sep 17 00:00:00 2001 From: Antoine Phan Date: Fri, 23 May 2025 13:38:22 -0400 Subject: [PATCH 2/2] Add the double slashes `//` for redirect to work on Safari Ref https://github.com/DDMAL/VIM/issues/211 --- nginx/vim.conf.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx/vim.conf.template b/nginx/vim.conf.template index b23116ad..3b1303e4 100644 --- a/nginx/vim.conf.template +++ b/nginx/vim.conf.template @@ -15,7 +15,7 @@ server { server_name vim.staging.simssa.ca; // Nginx docs: https://nginx.org/en/docs/http/ngx_http_core_module.html#var_request_uri ($scheme is right below it) - return 301 $scheme:${HOST_NAME}$request_uri; + return 301 $scheme://${HOST_NAME}$request_uri; }