From 3475c13a56995a1f143db2d67143154949504ea5 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 3 Dec 2020 16:48:28 +0100
Subject: [PATCH] public-access-proxy: update haproxy settings to 2.1

---
 hosts/containers/public-access-proxy/proxy.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hosts/containers/public-access-proxy/proxy.nix b/hosts/containers/public-access-proxy/proxy.nix
index 5d7d24bc..50692115 100644
--- a/hosts/containers/public-access-proxy/proxy.nix
+++ b/hosts/containers/public-access-proxy/proxy.nix
@@ -79,7 +79,7 @@ in {
         frontend http-in
           bind :::80 v4v6
           timeout client 30000
-          option http-tunnel
+          option http-keep-alive
           default_backend proxy-backend-http
   
         backend proxy-backend-http
@@ -89,8 +89,8 @@ in {
           mode http
           option http-server-close
           option forwardfor
-          reqadd X-Forwarded-Proto:\ http
-          reqadd X-Forwarded-Port:\ 80
+          http-request add-header X-Forwarded-Proto:\ http
+          http-request add-header X-Forwarded-Port:\ 80
           ${concatMapStringsSep "\n" (proxyHost:
             optionalString (proxyHost.hostNames != [] && proxyHost.proxyTo.host != null) (
               concatMapStringsSep "\n" (hostname: ''
@@ -112,8 +112,8 @@ in {
           timeout check 5000
           timeout server 30000
           option http-server-close
-          reqadd X-Forwarded-Proto:\ https
-          reqadd X-Forwarded-Port:\ 443
+          http-request add-header X-Forwarded-Proto:\ https
+          http-request add-header X-Forwarded-Port:\ 443
           ${concatMapStringsSep "\n" (proxyHost:
             optionalString (proxyHost.hostNames != [] && proxyHost.proxyTo.host != null) (
               concatMapStringsSep "\n" (hostname: ''