From 797c44a27deed320a6ef7c5571b7f57d80284088 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 1 Jul 2021 22:28:25 +0100
Subject: [PATCH] Use proxy protocol v2

Apparently it's better for chaining, and may be faster anyway
---
 ansible/roles/gateway/files/haproxy.cfg |  6 +++---
 ansible/roles/ingress/files/haproxy.cfg | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/roles/gateway/files/haproxy.cfg b/ansible/roles/gateway/files/haproxy.cfg
index 23289f0..d423533 100644
--- a/ansible/roles/gateway/files/haproxy.cfg
+++ b/ansible/roles/gateway/files/haproxy.cfg
@@ -21,7 +21,7 @@ listen https
   timeout connect 10m
   timeout client  10m
   timeout server  10m
-  server default {{ wireguard.clients.ingress.ip }}:8443 send-proxy
+  server default {{ wireguard.clients.ingress.ip }}:8443 send-proxy-v2
 
 listen http
   bind *:80
@@ -33,9 +33,9 @@ listen http
   timeout connect 10m
   timeout client  10m
   timeout server  10m
-  server default {{ wireguard.clients.ingress.ip }}:880 send-proxy
+  server default {{ wireguard.clients.ingress.ip }}:880 send-proxy-v2
 
 listen matrix
   bind *:8448
   mode tcp
-  server default {{ wireguard.clients.ingress.ip }}:8443 send-proxy
+  server default {{ wireguard.clients.ingress.ip }}:8443 send-proxy-v2
diff --git a/ansible/roles/ingress/files/haproxy.cfg b/ansible/roles/ingress/files/haproxy.cfg
index 6abaee4..3081361 100644
--- a/ansible/roles/ingress/files/haproxy.cfg
+++ b/ansible/roles/ingress/files/haproxy.cfg
@@ -18,25 +18,25 @@ defaults
 listen http_internal
     bind *:80
     mode http
-    server default {{ pve_hosts.pve_docker.ip }}:80 send-proxy
+    server default {{ pve_hosts.pve_docker.ip }}:80 send-proxy-v2
 
 listen https_internal
     bind *:443
     mode tcp
-    server default {{ pve_hosts.pve_docker.ip }}:443 send-proxy
+    server default {{ pve_hosts.pve_docker.ip }}:443 send-proxy-v2
 
 listen matrix_internal
     bind *:8448
     mode tcp
-    server default {{ pve_hosts.pve_docker.ip }}:443 send-proxy
+    server default {{ pve_hosts.pve_docker.ip }}:443 send-proxy-v2
 
 # External routes
 listen http_external
     bind *:880 accept-proxy
     mode http
-    server default {{ pve_hosts.pve_docker.ip }}:80 send-proxy
+    server default {{ pve_hosts.pve_docker.ip }}:80 send-proxy-v2
 
 listen https_external
     bind *:8443 accept-proxy
     mode tcp
-    server default {{ pve_hosts.pve_docker.ip }}:443 send-proxy
+    server default {{ pve_hosts.pve_docker.ip }}:443 send-proxy-v2