From 54c05cfcad7ca06855b94b8484656d36c2328ae4 Mon Sep 17 00:00:00 2001 From: Tricia Jenkins Date: Fri, 28 Aug 2020 14:40:26 -0600 Subject: [PATCH 1/2] fix 301 redirect $server_name ends up being the docker container id, which is decidedly not helpful to the outside world and not routable. host is what we really want. --- CHANGELOG.md | 1 + config/nginx.conf | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f879f7162..08366f21d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ and releases in Jupiter project adheres to [Semantic Versioning](http://semver.o ### Fixed - Upgrade Rubocop/Erblint and fix cop violations [#1803](https://github.com/ualbertalib/jupiter/pull/1803) +- UAT nginx port 80 redirect []() ## [2.0.1.pre1] - 2020-07-22 diff --git a/config/nginx.conf b/config/nginx.conf index c62c75414..df2838b36 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -5,7 +5,7 @@ upstream jupiter { server { listen 80; server_name $HOSTNAME; - return 301 https://$server_name$request_uri; + return 301 https://$host$request_uri; } server { @@ -38,6 +38,7 @@ server { proxy_set_header X-Forwarded-Proto https; proxy_set_header Origin https://$http_host; proxy_redirect off; + proxy_pass http://jupiter; # limit_req zone=one; From 1b49b7f521f0806fa43885cb6e4ff0760d265704 Mon Sep 17 00:00:00 2001 From: Tricia Jenkins Date: Fri, 28 Aug 2020 14:45:58 -0600 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08366f21d..777f4161b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ and releases in Jupiter project adheres to [Semantic Versioning](http://semver.o ### Fixed - Upgrade Rubocop/Erblint and fix cop violations [#1803](https://github.com/ualbertalib/jupiter/pull/1803) -- UAT nginx port 80 redirect []() +- UAT nginx port 80 redirect [PR#1893](https://github.com/ualbertalib/jupiter/pull/1839) ## [2.0.1.pre1] - 2020-07-22