Merge ~troyanov/maas:backport-0a9ac75-3.4 into maas:3.4

[Anton Troyanov]

fix: use original Host value when proxy_set_header

Resolves LP:2022926

(cherry picked from commit 0a9ac75f7875dfad198ccaa4f2e322fa6521f38f)

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport-0a9ac75-3.4 lp:~troyanov/maas/+git/maas into -b 3.4 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 62417dd538f66b03e97acfe77599d5616f73911f

review: Approve

[Anton Troyanov (troyanov)]

Self-approve backporting the fix

review: Approve

diff --git a/src/provisioningserver/templates/http/rackd.nginx.conf.template b/src/provisioningserver/templates/http/rackd.nginx.conf.template
index f73a7be..8ec9ae0 100644
--- a/src/provisioningserver/templates/http/rackd.nginx.conf.template
+++ b/src/provisioningserver/templates/http/rackd.nginx.conf.template
@@ -12,9 +12,9 @@ server {
 
     {{if upstream_http}}
     location /MAAS/ {
-        proxy_set_header Host $host;
+        proxy_set_header Host $http_host;
         proxy_set_header X-Real-IP $remote_addr;
-        proxy_set_header X-Forwarded-Host $host:$server_port;
+        proxy_set_header X-Forwarded-Host $http_host;
         proxy_set_header X-Forwarded-Server $host;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;