Added federation sender workers to setup

Reviewed-on: #4
Co-authored-by: andreas <andreas@feldt.io>
Co-committed-by: andreas <andreas@feldt.io>

README.md

@@ -30,6 +30,7 @@ Remove the current database entry from the file and copy everything from the "ho
 Set the database password to the one set in the "docker-compose.yml".
 Change the turn server uris to your turn domain name.
 Set the "turn_shared_secret" to the value of the "static-auth-secret" in the "turnserver.conf" file.
+Add "public_baseurl: "https://matrix.yourdomain.com:8448" on the line under "server_name"
 
 Now run `docker compose up -d` to start everything.
 To create your use, run `docker exec -it synapse register_new_matrix_user http://localhost:8008 -c /data/homeserver.yaml` and fill in all the values.

caddy/Caddyfile

@@ -3,7 +3,7 @@ matrix.m00.se {
   log
 
   reverse_proxy /_matrix/* http://synapse:8008
-  reverse_proxy /_synapse/client/* http://synapse:8008
+  reverse_proxy /_synapse/* http://synapse:8008
 }
 matrix.m00.se:8448 {
   reverse_proxy /_matrix/* synapse:8008

docker-compose.yml

@@ -3,6 +3,8 @@ services:
     depends_on:
       caddy:
         condition: service_started
+      redis:
+        condition: service_started
       postgres:
         condition: service_started
     container_name: synapse
@@ -71,12 +73,94 @@ services:
       - matrix-network
     restart: "unless-stopped"
 
+  redis:
+    container_name: redis
+    image: redis:8.0-M03-alpine
+    restart: always
+    volumes:
+      - redis_data:/data
+    networks:
+      - matrix-network
+
+  synapse-federation-sender-1:
+    image: matrixdotorg/synapse:latest
+    container_name: synapse-federation-sender-1
+    restart: unless-stopped
+    entrypoint: [ "/start.py", "run", "--config-path=/data/homeserver.yaml", "--config-path=/data/workers/synapse-federation-sender-1.yaml" ]
+    healthcheck:
+      disable: true
+    volumes:
+      - ./synapse:/data:rw
+    networks:
+      - matrix-network
+    user: "1000:1000"
+    environment:
+      SYNAPSE_WORKER: synapse.app.federation_sender
+    depends_on:
+      - synapse
+      - redis
+
+  synapse-federation-sender-2:
+    image: matrixdotorg/synapse:latest
+    container_name: synapse-federation-sender-2
+    restart: unless-stopped
+    entrypoint: [ "/start.py", "run", "--config-path=/data/homeserver.yaml", "--config-path=/data/workers/synapse-federation-sender-2.yaml" ]
+    healthcheck:
+      disable: true
+    volumes:
+      - ./synapse:/data:rw
+    networks:
+      - matrix-network
+    user: "1000:1000"
+    environment:
+      SYNAPSE_WORKER: synapse.app.federation_sender
+    depends_on:
+      - synapse
+      - redis
+
+  synapse-federation-sender-3:
+    image: matrixdotorg/synapse:latest
+    container_name: synapse-federation-sender-3
+    restart: unless-stopped
+    entrypoint: [ "/start.py", "run", "--config-path=/data/homeserver.yaml", "--config-path=/data/workers/synapse-federation-sender-3.yaml" ]
+    healthcheck:
+      disable: true
+    volumes:
+      - ./synapse:/data:rw
+    networks:
+      - matrix-network
+    user: "1000:1000"
+    environment:
+      SYNAPSE_WORKER: synapse.app.federation_sender
+    depends_on:
+      - synapse
+      - redis
+
+  synapse-federation-sender-4:
+    image: matrixdotorg/synapse:latest
+    container_name: synapse-federation-sender-4
+    restart: unless-stopped
+    entrypoint: [ "/start.py", "run", "--config-path=/data/homeserver.yaml", "--config-path=/data/workers/synapse-federation-sender-4.yaml" ]
+    healthcheck:
+      disable: true
+    volumes:
+      - ./synapse:/data:rw
+    networks:
+      - matrix-network
+    user: "1000:1000"
+    environment:
+      SYNAPSE_WORKER: synapse.app.federation_sender
+    depends_on:
+      - synapse
+      - redis
 
 networks:
   matrix-network:
 
+
 volumes:
   caddy_data:
   caddy_config:
   synapse-data:
 
+

synapse/homeserver.template

@@ -1,3 +1,41 @@
+listeners:
+  - port: 8008
+    tls: false
+    type: http
+    x_forwarded: true
+    resources:
+      - names: [client, federation]
+        compress: false
+
+  - port: 9093
+    type: http
+    resources:
+      - names: [replication]
+
+send_federation: false
+federation_sender_instances:
+  - synapse-federation-sender-1
+  - synapse-federation-sender-2
+  - synapse-federation-sender-3
+  - synapse-federation-sender-4
+
+redis:
+  enabled: true
+  host: redis
+  port: 6379
+
+instance_map:
+  main:
+    host: 'localhost'
+    port: 9093
+
+worker_listeners:
+  - type: http
+    port: 8083
+    x_forwarded: true
+    resources:
+      - names: [client, federation]
+
 database:
   name: psycopg2
   args:

synapse/workers/synapse-federation-sender-1.yml

@@ -0,0 +1,2 @@
+worker_app: synapse.app.federation_sender
+worker_name: synapse-federation-sender-1

synapse/workers/synapse-federation-sender-2.yml

@@ -0,0 +1,2 @@
+worker_app: synapse.app.federation_sender
+worker_name: synapse-federation-sender-2

synapse/workers/synapse-federation-sender-3.yml

@@ -0,0 +1,2 @@
+worker_app: synapse.app.federation_sender
+worker_name: synapse-federation-sender-3

synapse/workers/synapse-federation-sender-4.yml

@@ -0,0 +1,2 @@
+worker_app: synapse.app.federation_sender
+worker_name: synapse-federation-sender-4