From f30f07eacb3e9871a8bc9f9d11cd6f9a35ba6af2 Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Sat, 9 Feb 2019 15:43:15 +0100
Subject: [PATCH] Add riot.im.conf and stuff to matrix role

---
 roles/docker/files/configs/riot.im.conf     |  6 +++++
 roles/docker/tasks/services/matrix_riot.yml | 27 ++++++++++++++++++++-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 roles/docker/files/configs/riot.im.conf

diff --git a/roles/docker/files/configs/riot.im.conf b/roles/docker/files/configs/riot.im.conf
new file mode 100644
index 00000000..953aedf3
--- /dev/null
+++ b/roles/docker/files/configs/riot.im.conf
@@ -0,0 +1,6 @@
+-p 8765
+-A matrix
+-c 3500
+--ssl
+--cert /data/fullchain.pem
+--key /data/key.pem
\ No newline at end of file
diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
index 07897ddd..d8845ae3 100644
--- a/roles/docker/tasks/services/matrix_riot.yml
+++ b/roles/docker/tasks/services/matrix_riot.yml
@@ -8,6 +8,20 @@
   docker_volume:
     name: matrix_db
 
+- name: riot volume
+  docker_volume:
+    name: riot_app
+
+- name: upload riot config.json
+  template:
+    src: files/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
+
 - name: matrix container
   docker_container:
     name: matrix
@@ -26,10 +40,21 @@
     state: started
     restart_policy: always
     networks:
-      - name: nextcloud
+      - name: matrix
     volumes:
       - matrix_db:/var/lib/postgresql/data
     env:
       POSTGRES_DB: somethingelse
       POSTGRES_USER: matrix
       POSTGRES_PASSWORD: "{{ postgres_passwords.matrix }}"
+
+- name: riot container
+  docker_container:
+    name: riot_app
+    image: avhost/docker-matrix-riot
+    state: started
+    restart_policy: always
+    networks:
+      - name: matrix
+      - name: external_services
+