From 085df57d848e306f1a507e40057e296051674173 Mon Sep 17 00:00:00 2001
From: Jade Ellis <jade@ellis.link>
Date: Sat, 19 Oct 2024 12:31:41 +0100
Subject: [PATCH] Fix matrix federation

---
 servers/containers/conduwuit-testing.container |  2 +-
 servers/containers/conduwuit.container         |  2 +-
 servers/containers/traefik.container           |  6 ++++++
 servers/traefik/config.toml                    | 12 ++++++++++++
 4 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/servers/containers/conduwuit-testing.container b/servers/containers/conduwuit-testing.container
index 030405e2..5fe25e3e 100644
--- a/servers/containers/conduwuit-testing.container
+++ b/servers/containers/conduwuit-testing.container
@@ -21,7 +21,7 @@ Label="traefik.enable=true"
 Label="traefik.http.routers.conduwuit-testing.rule=(Host(`matrix.pissing.dev`) || (Host(`pissing.dev`) && PathPrefix(`/.well-known/matrix`)))"
 Label="traefik.http.services.conduwuit-testing.loadbalancer.server.port=6167"
 
-Label="traefik.http.routers.conduwuit-testing.entrypoints=https"
+Label="traefik.http.routers.conduwuit-testing.entrypoints=https,matrix"
 
 Label="traefik.http.routers.conduwuit-testing.tls.certresolver=letsencrypt"
 # Label="traefik.http.routers.conduwuit-testing.tls.options=intermediate@file"
diff --git a/servers/containers/conduwuit.container b/servers/containers/conduwuit.container
index a5551453..d5dff7a6 100644
--- a/servers/containers/conduwuit.container
+++ b/servers/containers/conduwuit.container
@@ -21,7 +21,7 @@ Label="traefik.enable=true"
 Label="traefik.http.routers.conduwuit.rule=(Host(`matrix.ellis.link`) || (Host(`ellis.link`) && PathPrefix(`/.well-known/matrix`)))"
 Label="traefik.http.services.conduwuit.loadbalancer.server.port=6167"
 
-Label="traefik.http.routers.conduwuit.entrypoints=https"
+Label="traefik.http.routers.conduwuit.entrypoints=https,matrix"
 
 Label="traefik.http.routers.conduwuit.tls.certresolver=letsencrypt"
 # Label="traefik.http.routers.conduwuit.tls.options=intermediate@file"
diff --git a/servers/containers/traefik.container b/servers/containers/traefik.container
index a0c45598..129ebe86 100644
--- a/servers/containers/traefik.container
+++ b/servers/containers/traefik.container
@@ -20,6 +20,12 @@ PublishPort=[::]:80:80/tcp
 PublishPort=[::]:443:443/tcp
 PublishPort=[::]:443:443/udp
 
+# Matrix
+PublishPort=0.0.0.0:8448:8448/tcp
+PublishPort=0.0.0.0:8448:8448/udp
+PublishPort=[::]:8448:8448/tcp
+PublishPort=[::]:8448:8448/udp
+
 # PublishPort=8448:8448/tcp
 ReadOnly=true
 Volume=/run/podman/podman.sock:/var/run/docker.sock:z
diff --git a/servers/traefik/config.toml b/servers/traefik/config.toml
index 59b139c5..64c833e9 100644
--- a/servers/traefik/config.toml
+++ b/servers/traefik/config.toml
@@ -14,6 +14,10 @@ address = ":80"
 address = ":443"
 [entrypoints.https.http3]
 
+[entrypoints.matrix]
+address = ":8448"
+[entrypoints.matrix.http3]
+
 [entryPoints.http.proxyProtocol]
 insecure = false
 trustedIPs = [ ]
@@ -30,6 +34,14 @@ trustedIPs = [ ]
 insecure = false
 trustedIPs = [ ]
 
+[entryPoints.matrix.proxyProtocol]
+insecure = false
+trustedIPs = [ ]
+
+[entryPoints.matrix.forwardedHeaders]
+insecure = false
+trustedIPs = [ ]
+
 [entrypoints.http.http.redirections.entryPoint]
 to="https" 
 scheme = "https"