sts-sponsors team mailing list archive

[Anton Troyanov <mp+439081@xxxxxxxxxxxxxxxxxx>]

Anton Troyanov has proposed merging ~troyanov/maas:proxy-headers-backport-3.2 into maas:3.2.

Commit message:
fix(region): use $http_host to read Host header

$http_name
arbitrary request header field;

the last part of a variable name is the field name converted to lower case
with dashes replaced by underscores

Resolves LP:2009186

(cherry picked from commit eff39899eab1331f712aa8c4f9f2004f9aded683)

Requested reviews:
  MAAS Lander (maas-lander): unittests
  Anton Troyanov (troyanov)

For more details, see:
https://code.launchpad.net/~troyanov/maas/+git/maas/+merge/439081
-- 
Your team MAAS Committers is subscribed to branch maas:3.2.

diff --git a/src/maasserver/templates/http/regiond.nginx.conf.template b/src/maasserver/templates/http/regiond.nginx.conf.template
index 22ad4ee..f34ac01 100644
--- a/src/maasserver/templates/http/regiond.nginx.conf.template
+++ b/src/maasserver/templates/http/regiond.nginx.conf.template
@@ -11,7 +11,7 @@ proxy_set_header Host $host;
 proxy_set_header X-Real-IP $remote_addr;
 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 proxy_set_header X-Forwarded-Proto $scheme;
-proxy_set_header X-Forwarded-Host $host:$server_port;
+proxy_set_header X-Forwarded-Host $http_host;
 
 server {
     {{if tls_enabled}}