From 1018c766331d395ca1890a106bb278150ab7bb4b Mon Sep 17 00:00:00 2001
From: Alex Denes <caskd@redxen.eu>
Date: Tue, 30 May 2023 20:16:56 +0000
Subject: [PATCH] Fixup wssproxy

---
 config/haproxy/APKBUILD | 4 ++--
 config/haproxy/main.cfg | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/haproxy/APKBUILD b/config/haproxy/APKBUILD
index d514b67..fc811c5 100644
--- a/config/haproxy/APKBUILD
+++ b/config/haproxy/APKBUILD
@@ -3,7 +3,7 @@
 
 . ../APKBUILD-config.template
 
-pkgver=2022.04.02.02
+pkgver=2023.05.24.04
 pkgrel=0
 depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
 checkdepends="haproxy"
@@ -15,5 +15,5 @@ check() {
 }
 
 sha512sums="
-45bd2aa36469225968df94843d4548064f601ebc7d353fed75d8e50cd1eb0edad12e9ba07e1d05cd88ce2597cb4d411585a613f349ceb08fb5061e30cc6be97b  main.cfg
+04c82c113fb6096a97b38044d55515028eb8309483d31e480bf536b3e4cb00d75a693e5224bb0ac5b25586b40669c0edeae2a4a96f2b5029d5d4c998a748341b  main.cfg
 "
diff --git a/config/haproxy/main.cfg b/config/haproxy/main.cfg
index d37fc5d..84e48eb 100644
--- a/config/haproxy/main.cfg
+++ b/config/haproxy/main.cfg
@@ -84,7 +84,6 @@ frontend http
 	acl btdaemon  hdr_beg(host) -i     seed.redxen
 	acl packs     hdr_beg(host) -i packages.redxen
 	acl cal       hdr_beg(host) -i      cal.redxen
-	acl wssproxy  hdr_beg(host) -i wssproxy.redxen
 	acl monerod   hdr_beg(host) -i  monerod.redxen
 
 	redirect location https://en.uncyclopedia.co/wiki/South_Africa code 302 if fedi
@@ -98,8 +97,9 @@ frontend http
 	use_backend backend-btdaemon     if btdaemon
 	use_backend backend-packages     if packs
 	use_backend backend-radicale     if cal
-	use_backend backend-wssproxy     if wssproxy
 	#use_backend backend-monerod     if monerod
+	# Fallback to wssproxy to bypass SNI/domain filters
+	use_backend backend-wssproxy
 
 backend backend-home
 	server-template root 1 _root._tcp.routinginfo.internal
@@ -143,7 +143,8 @@ backend backend-radicale
 backend backend-wssproxy
 	server-template wssproxy 1 _wssproxy._tcp.routinginfo.internal
 	option httpchk HEAD / HTTP/1.1
-	http-check send hdr Host wss-proxy.redxen.eu
+	http-check send hdr Host localhost
+	http-check expect status 404
 
 #backend backend-monerod
 #	server-template monerod 1 _monerod._tcp.routinginfo.internal