From 2d74e3ad70876ed09b606704e9bd984bae4a2133 Mon Sep 17 00:00:00 2001 From: Devendra Modium Date: Tue, 27 Oct 2020 21:30:48 -0700 Subject: [PATCH] Update frontend_helper.py fixes for reqadd deprecated in HaProxy 2.1 --- haproxy/helper/frontend_helper.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/haproxy/helper/frontend_helper.py b/haproxy/helper/frontend_helper.py index 7cfab7e..a9cada5 100644 --- a/haproxy/helper/frontend_helper.py +++ b/haproxy/helper/frontend_helper.py @@ -99,9 +99,9 @@ def config_common_part(port, ssl_bind_string, vhosts): # add x-forwarded-porto header if not skipped if not SKIP_FORWARDED_PROTO: if ssl: - frontend_section.append("reqadd X-Forwarded-Proto:\ https") + frontend_section.append("http-request add-header X-Forwarded-Proto https") else: - frontend_section.append("reqadd X-Forwarded-Proto:\ http") + frontend_section.append("http-request add-header X-Forwarded-Proto http") # add maxconn frontend_section.append("maxconn %s" % MAXCONN) @@ -163,11 +163,11 @@ def config_default_frontend_by_port(port, ssl_bind_string): frontend = [("bind :%s %s %s" % (port, ssl_bind_string, EXTRA_BIND_SETTINGS.get(port, ""))).strip()] # add x-forwarded-porto header if not skipped if not SKIP_FORWARDED_PROTO: - frontend.append("reqadd X-Forwarded-Proto:\ https") + frontend.append("http-request add-header X-Forwarded-Proto https") else: frontend = [("bind :%s %s" % (port, EXTRA_BIND_SETTINGS.get(port, ""))).strip()] if not SKIP_FORWARDED_PROTO: - frontend.append("reqadd X-Forwarded-Proto:\ http") + frontend.append("http-request add-header X-Forwarded-Proto http") frontend.append("maxconn %s" % MAXCONN)