Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix 301 redirect on UAT #1839

Merged
merged 2 commits into from
Aug 28, 2020
Merged

fix 301 redirect on UAT #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54c05cf
fix 301 redirect
pgwillia Aug 28, 2020
1b49b7f
Update CHANGELOG.md
pgwillia Aug 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 [PR#1893](https://github.com/ualbertalib/jupiter/pull/1839)

## [2.0.1.pre1] - 2020-07-22

Expand Down
3 changes: 2 additions & 1 deletion config/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
Expand Down