From 6805197c3106de22ec7bf02db8411bcf818ec9e2 Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Sat, 9 Feb 2019 17:00:47 +0100
Subject: [PATCH] Fixing riot and matrix stuff

---
 roles/docker/tasks/services/matrix_riot.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
index 8adaf83a..eff75213 100644
--- a/roles/docker/tasks/services/matrix_riot.yml
+++ b/roles/docker/tasks/services/matrix_riot.yml
@@ -14,23 +14,26 @@
 
 - name: upload riot config.json
   template:
-    src: files/riot-config.json
-    dest: /var/lib/docker/volumes/riot_app/data/config.json
+    src: files/configs/riot-config.json
+    dest: /var/lib/docker/volumes/riot_app/_data/config.json
 
 - name: upload riot.im.conf
   template:
-    src: files/riot.im.conf
-    dest: /var/lib/docker/volumes/riot_app/data/riot.im.conf
+    src: files/configs/riot.im.conf
+    dest: /var/lib/docker/volumes/riot_app/_data/riot.im.conf
 
 - name: matrix container
   docker_container:
     name: matrix
     image: matrixdotorg/synapse:latest
+    networks:
+      - name: matrix
     env:
-      SYNAPSE_SERVER_NAME: {{ matrix.domain }}
-      SYNAPSE_REPORT_STATS: no
-      SYNAPSE_ENABLE_REGISTRATION: yes
+      SYNAPSE_SERVER_NAME: "{{ matrix.domain }}"
+      SYNAPSE_REPORT_STATS: False
+      SYNAPSE_ENABLE_REGISTRATION: True
       SYNAPSE_LOG_LEVEL: INFO
+      POSTGRES_HOST: "matrix_db"
       POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}"
 
 - name: matrix database container
@@ -57,6 +60,8 @@
     networks:
       - name: matrix
       - name: external_services
+    volumes:
+      - riot_app:/data
     env:
       VIRTUAL_HOST: "{{ riot.domain }}"
       LETSENCRYPT_HOST: "{{ riot.domain }}"