From f29eae7f1ee62da96e70e7c752dd2309bd4b111a Mon Sep 17 00:00:00 2001
From: dogeystamp <dogeystamp@disroot.org>
Date: Sat, 9 Sep 2023 09:05:05 -0400
Subject: [PATCH] roles/synapse: fix mistakes

---
 roles/caddy/templates/Caddyfile.j2               | 4 ++--
 roles/containers/templates/docker-compose.yml.j2 | 6 ++----
 roles/synapse/tasks/main.yml                     | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/roles/caddy/templates/Caddyfile.j2 b/roles/caddy/templates/Caddyfile.j2
index caee944..d33f2bc 100644
--- a/roles/caddy/templates/Caddyfile.j2
+++ b/roles/caddy/templates/Caddyfile.j2
@@ -24,11 +24,11 @@ http://{{ navidrome_domain }} {
 {% endif %}
 
 {% if groups["synapse"] | length > 0 %}
-http://{{ synapse_domain }} {
+http://{{ matrix_domain }} {
 	reverse_proxy /_matrix/* {{ groups["synapse"][0] }}:8008
 	reverse_proxy /_synapse/client/* {{ groups["synapse"][0] }}:8008
 }
-{{ synapse_domain }}:8448 {
+{{ matrix_domain }}:8448 {
 	reverse_proxy /_matrix/* {{ groups["synapse"][0] }}:8008
 }
 {% endif %}
diff --git a/roles/containers/templates/docker-compose.yml.j2 b/roles/containers/templates/docker-compose.yml.j2
index 6812b8b..561084b 100644
--- a/roles/containers/templates/docker-compose.yml.j2
+++ b/roles/containers/templates/docker-compose.yml.j2
@@ -70,16 +70,14 @@ services:
     image: matrixdotorg/synapse:latest
     user: {{ user_synapse.uid }}:{{ user_synapse.group }}
     environment:
-      SYNAPSE_CONFIG_PATH=/data/homeserver.yaml
+      SYNAPSE_CONFIG_PATH: /data/homeserver.yaml
     restart: unless-stopped
     volumes:
-      - "{{ dataroot }}/synapse/uploads:/data/uploads"
-      - "{{ dataroot }}/synapse/media:/data/media"
+      - "{{ dataroot }}/synapse/media_store:/data/media_store"
       - "{{ dataroot }}/synapse/data:/data"
     networks:
       - navidrome
     ports:
-      - "8448:8448/tcp"
       - "8008:8008/tcp"
 
 {% endif %}
diff --git a/roles/synapse/tasks/main.yml b/roles/synapse/tasks/main.yml
index e8e103d..dfa025c 100644
--- a/roles/synapse/tasks/main.yml
+++ b/roles/synapse/tasks/main.yml
@@ -14,8 +14,7 @@
     mode: "u=rwX,g=,o="
   with_items:
     - "{{ dataroot }}/synapse/data"
-    - "{{ dataroot }}/synapse/uploads"
-    - "{{ dataroot }}/synapse/media"
+    - "{{ dataroot }}/synapse/media_store"
 
 - name: Deploy Synapse config
   template:
@@ -25,6 +24,6 @@
 
 - name: Deploy Synapse logging config
   template:
-    src: homeserver.yaml.j2
+    src: log.config.j2
     dest: "{{ dataroot }}/synapse/data/log.config"
     lstrip_blocks: yes