From 34788bd655fe749840e0f5f539bb9f816e3969ca Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Wed, 31 Mar 2021 01:49:39 +0200
Subject: [PATCH] Setup matrix federation

---
 dns/banditlair.com.zone                       |  3 +-
 .../files/matrix/docker-compose.yml           | 34 +++++++++++++++----
 .../files/searx/docker-compose.yml            | 14 ++++----
 .../templates/data/traefik.toml               |  2 +-
 .../templates/docker-compose.yml              |  4 +--
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/dns/banditlair.com.zone b/dns/banditlair.com.zone
index 9c9f34d..558e2f4 100644
--- a/dns/banditlair.com.zone
+++ b/dns/banditlair.com.zone
@@ -13,9 +13,10 @@ ddns.banditlair.com. 3600 IN NS ns.banditlair.com.
 @        600 IN A     144.76.18.197
 *        600 IN CNAME @
 storage1 600 IN A     144.76.18.197
+matrix   600 IN A     144.76.18.197
 
 ; Matrix special record
-banditlair.com.banditlair.com. 86400 IN SRV 12 10 8448 matrix.banditlair.com.
+_matrix._tcp.banditlair.com. 86400 IN SRV 12 10 443 matrix.banditlair.com.
 
 ; Mail server related records
 ;webmail                     86400 IN A   144.76.18.197
diff --git a/roles/matrix-docker/files/matrix/docker-compose.yml b/roles/matrix-docker/files/matrix/docker-compose.yml
index 644e3b1..55e8878 100644
--- a/roles/matrix-docker/files/matrix/docker-compose.yml
+++ b/roles/matrix-docker/files/matrix/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "2"
 services:
   db:
-    image: postgres:9.6
+    image: postgres:9
     restart: always
     ports:
       - "127.0.0.1:5432:5432"
@@ -17,15 +17,18 @@ services:
 
   synapse:
     image: matrixdotorg/synapse
-    ports:
-      - "127.0.0.1:8008:8008"
+#    ports:
+      # Coturn
+#      - "3478:3478"
+#      - "5349:5349"
     labels:
-      - "traefik.backend=synapse"
-      - "traefik.docker.network=web"
-      - "traefik.frontend.rule=Host:matrix.banditlair.com"
       - "traefik.enable=true"
-      - "traefik.port=8008"
       - "traefik.default.protocol=http"
+      - "traefik.docker.network=web"
+      - "traefik.port=8008"
+      - "traefik.backend=synapse"
+      - "traefik.frontend.rule=Host:banditlair.com,matrix.banditlair.com"
+      - "traefik.frontend.passHostHeader=true"
     volumes:
       - /var/lib/matrix/media_store:/data/media_store
       - /var/log/synapse:/data/log
@@ -47,6 +50,23 @@ services:
     tmpfs:
       - /var/lib/coturn
 
+  dimension:
+    image: turt2live/matrix-dimension
+    labels:
+      - "traefik.docker.network=web"
+      - "traefik.backend=dimension"
+      - "traefik.frontend.rule=Host:dimension.banditlair.com"
+      - "traefik.enable=true"
+      - "traefik.port=8184"
+      - "traefik.default.protocol=http"
+    expose:
+      - 8184
+    volumes:
+      - ./dimension:/data
+    networks:
+      - web
+    restart: always
+
 networks:
   matrix:
     external:
diff --git a/roles/searx-docker/files/searx/docker-compose.yml b/roles/searx-docker/files/searx/docker-compose.yml
index 28989fb..a346b77 100644
--- a/roles/searx-docker/files/searx/docker-compose.yml
+++ b/roles/searx-docker/files/searx/docker-compose.yml
@@ -11,13 +11,13 @@ services:
     environment:
       - BASE_URL="https://banditlair.com"
       - IMAGE_PROXY=True
-    labels:
-      - "traefik.backend=searx"
-      - "traefik.docker.network=web"
-      - "traefik.frontend.rule=Host:banditlair.com"
-      - "traefik.enable=true"
-      - "traefik.port=8888"
-      - "traefik.default.protocol=http"
+#    labels:
+#      - "traefik.backend=searx"
+#      - "traefik.docker.network=web"
+#      - "traefik.frontend.rule=Host:banditlair.com"
+#      - "traefik.enable=true"
+#      - "traefik.port=8888"
+#      - "traefik.default.protocol=http"
     networks:
       - web
     restart: always
diff --git a/roles/traefik-proxy-docker/templates/data/traefik.toml b/roles/traefik-proxy-docker/templates/data/traefik.toml
index 594a608..ab7f7ce 100644
--- a/roles/traefik-proxy-docker/templates/data/traefik.toml
+++ b/roles/traefik-proxy-docker/templates/data/traefik.toml
@@ -10,7 +10,7 @@ defaultEntryPoints = ["https","http"]
     entryPoint = "https"
   [entryPoints.https]
   address = ":443"
-  [entryPoints.https.tls]
+    [entryPoints.https.tls]
   [entryPoints.traefik]
   address = ":8080"
 
diff --git a/roles/traefik-proxy-docker/templates/docker-compose.yml b/roles/traefik-proxy-docker/templates/docker-compose.yml
index 4ba014b..a9c0cf2 100644
--- a/roles/traefik-proxy-docker/templates/docker-compose.yml
+++ b/roles/traefik-proxy-docker/templates/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   traefik:
     container_name: traefik
-    image: traefik:1.7.12-alpine
+    image: traefik:1.7-alpine
     ports:
       - 80:80
       - 443:443
@@ -15,7 +15,7 @@ services:
     labels:
       - "traefik.backend=traefik"
       - "traefik.docker.network=web"
-      - "traefik.frontend.rule=Host:traefik.{{inventory_hostname}}.banditlair.com"
+      - "traefik.frontend.rule=Host:traefik.banditlair.com"
       - "traefik.enable=true"
       - "traefik.port=8080"
       - "traefik.default.protocol=http"