From fc95fa8cdbd384891a60bc7c512381a7bb220854 Mon Sep 17 00:00:00 2001
From: Magnus Bergman <mb@citynetwork.se>
Date: Fri, 28 Feb 2020 20:44:05 +0100
Subject: [PATCH] Add missing X-Forwarded-Prot for extra_lb_tls_vip_addresses

This fixes a missing parameter for the extra_lb_tls_vip_addresses
feature introduced by change 705228.

Change-Id: I8fdbfd2100e84e6344f48c193e9430002102e5fa
---
 templates/service.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/service.j2 b/templates/service.j2
index e381897..51c40de 100644
--- a/templates/service.j2
+++ b/templates/service.j2
@@ -66,7 +66,7 @@ frontend {{ item.service.haproxy_service_name }}-front-{{ loop.index }}
     use_backend {{ value.backend_name | default(item.service.haproxy_service_name) }}-back if {{ key }}
 {%   endfor %}
 {% endif %}
-{% if (item.service.haproxy_ssl | default(false) | bool) and request_option == 'http' and (loop.index == 1 or item.service.haproxy_ssl_all_vips | default(false) | bool) %}
+{% if (item.service.haproxy_ssl | default(false) | bool) and request_option == 'http' and (loop.index == 1 or vip_bind in extra_lb_tls_vip_addresses or item.service.haproxy_ssl_all_vips | default(false) | bool) %}
     reqadd X-Forwarded-Proto:\ https
 {% endif %}
     mode {{ item.service.haproxy_balance_type }}