From 6d3450d9ae31d67aaa68f4c3cb952becf4d6b890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reynir=20Bj=C3=B6rnsson?= <reynir@reynir.dk>
Date: Tue, 9 Feb 2021 21:01:38 +0100
Subject: [PATCH] Use copy instead of template for static files

---
 roles/docker/tasks/services/matrix_riot.yml | 28 ++++++++++-----------
 roles/docker/tasks/services/privatebin.yml  |  4 +--
 roles/docker/tasks/services/thelounge.yml   |  4 +--
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
index 016cc6e..f3eb819 100644
--- a/roles/docker/tasks/services/matrix_riot.yml
+++ b/roles/docker/tasks/services/matrix_riot.yml
@@ -27,38 +27,38 @@
     loop_var: volume
 
 - name: upload riot config.json
-  template:
-    src: files/configs/riot/config.json
+  copy:
+    src: configs/riot/config.json
     dest: "{{ riot.volume_folder }}/data/config.json"
 
 - name: upload riot.im.conf
-  template:
-    src: files/configs/riot/riot.im.conf
+  copy:
+    src: configs/riot/riot.im.conf
     dest: "{{ riot.volume_folder }}/data/riot.im.conf"
 
 - name: upload vhost config for root domain
-  template:
-    src: files/configs/matrix/vhost-root
+  copy:
+    src: configs/matrix/vhost-root
     dest: "{{ nginx.volume_folder }}/vhost/{{ base_domain }}"
 
 - name: upload vhost config for matrix domain
-  template:
-    src: files/configs/matrix/vhost-matrix
+  copy:
+    src: configs/matrix/vhost-matrix
     dest: "{{ nginx.volume_folder }}/vhost/{{ matrix.domain }}"
 
 - name: upload vhost config for riot domain
-  template:
-    src: files/configs/matrix/vhost-riot
+  copy:
+    src: configs/matrix/vhost-riot
     dest: "{{ nginx.volume_folder }}/vhost/{{ riot.domains[0] }}"
 
 - name: upload homeserver.yaml
-  template:
-    src: "files/configs/matrix/homeserver.yaml"
+  copy:
+    src: "configs/matrix/homeserver.yaml"
     dest: "{{ matrix.volume_folder }}/data/homeserver.yaml"
 
 - name: upload matrix logging config
-  template:
-    src: "files/configs/matrix/matrix.data.coop.log.config"
+  copy:
+    src: "configs/matrix/matrix.data.coop.log.config"
     dest: "{{ matrix.volume_folder }}/data/matrix.data.coop.log.config"
 
 - name: set up matrix and riot
diff --git a/roles/docker/tasks/services/privatebin.yml b/roles/docker/tasks/services/privatebin.yml
index 3d0f7ad..65e690f 100644
--- a/roles/docker/tasks/services/privatebin.yml
+++ b/roles/docker/tasks/services/privatebin.yml
@@ -11,8 +11,8 @@
     loop_var: volume
 
 - name: upload privatebin config
-  template:
-    src: files/configs/privatebin-conf.php
+  copy:
+    src: configs/privatebin-conf.php
     dest: "{{ privatebin.volume_folder }}/cfg/conf.php"
 
 - name: privatebin app container
diff --git a/roles/docker/tasks/services/thelounge.yml b/roles/docker/tasks/services/thelounge.yml
index 1e269fd..3efc8b4 100644
--- a/roles/docker/tasks/services/thelounge.yml
+++ b/roles/docker/tasks/services/thelounge.yml
@@ -5,8 +5,8 @@
     name: thelounge
 
 - name: upload thelounge config
-  template:
-    src: files/configs/thelounge.js
+  copy:
+    src: configs/thelounge.js
     dest: /var/lib/docker/volumes/thelounge/_data/config.js
 
 - name: thelounge container