From 6197662fee2a9870f2157c3fc0aea95c5919bc6a Mon Sep 17 00:00:00 2001
From: Andrea Dell'Amico <andrea.dellamico@isti.cnr.it>
Date: Sat, 20 Jun 2020 00:50:42 +0200
Subject: [PATCH] The x-forwarded-host proxy setting must be configurable.

---
 defaults/main.yml                    | 1 +
 templates/nginx-proxy-params.conf.j2 | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index c866df1..3eb137c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -49,6 +49,7 @@ nginx_define_x_real_ip: False
 nginx_set_original_uri: True
 nginx_proxy_buffering: "on"
 nginx_proxy_redirect: "off"
+nginx_x_forwarded_host: "$remote_addr"
 nginx_proxy_buffer_size: 128k
 nginx_proxy_buffers: '4 {{ nginx_proxy_buffer_size }}'
 nginx_proxy_busy_buffers_size: 256k
diff --git a/templates/nginx-proxy-params.conf.j2 b/templates/nginx-proxy-params.conf.j2
index 2d834a4..7b35ca1 100644
--- a/templates/nginx-proxy-params.conf.j2
+++ b/templates/nginx-proxy-params.conf.j2
@@ -5,7 +5,7 @@ proxy_set_header Connection "";
 {% if haproxy_ips is defined %}
 proxy_set_header Host $http_host;
 proxy_set_header X-Real-IP $remote_addr;
-proxy_set_header X-Forwarded-Host $remote_addr;
+proxy_set_header X-Forwarded-Host {{ nginx_x_forwarded_host }};
 proxy_set_header X-Forwarded-Server $host;
 {% else %}
 proxy_set_header Host $host;