Merge ~troyanov/maas:backport-fix-1993618-to-3.2 into maas:3.2

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: c22b8c7d0efa511a3aafc8c3183d19e7bca923b2
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:backport-fix-1993618-to-3.2
Merge into: maas:3.2
Diff against target: 13 lines (+2/-0)
1 file modified
src/maasserver/templates/http/regiond.nginx.conf.template (+2/-0)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Jerzy Husakowski Approve
Review via email: mp+437323@code.launchpad.net

Commit message

LP:1993618 use relative redirects from nginx

(cherry picked from commit b872597ef539288b241a4338049c51ed97dbdcd1)

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-fix-1993618-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/1947/consoleText
COMMIT: c22b8c7d0efa511a3aafc8c3183d19e7bca923b2

review: Needs Fixing
Revision history for this message
Jerzy Husakowski (jhusakowski) wrote :

+1

review: Approve
Revision history for this message
Anton Troyanov (troyanov) wrote :

jenkins: !test

Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b backport-fix-1993618-to-3.2 lp:~troyanov/maas/+git/maas into -b 3.2 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c22b8c7d0efa511a3aafc8c3183d19e7bca923b2

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/templates/http/regiond.nginx.conf.template b/src/maasserver/templates/http/regiond.nginx.conf.template
2index e6fd44d..22ad4ee 100644
3--- a/src/maasserver/templates/http/regiond.nginx.conf.template
4+++ b/src/maasserver/templates/http/regiond.nginx.conf.template
5@@ -30,6 +30,8 @@ server {
6 listen {{http_port}};
7 {{endif}}
8
9+ absolute_redirect off;
10+
11 location = / {
12 return 301 /MAAS/r/;
13 }

Subscribers

People subscribed via source and target branches