Merge branch 'no-template' into move_templates

roles/docker/tasks/services/matrix_riot.yml

@@ -27,28 +27,28 @@
     loop_var: volume
 
 - name: upload riot config.json
-  template:
-    src: files/configs/riot/config.json
+  copy:
+    src: configs/riot/config.json
     dest: "{{ services.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: "{{ services.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: "{{ services.nginx_proxy.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: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
 
-- name: upload vhost config for riot domain
-  template:
-    src: files/configs/matrix/vhost-riot
+- name: upload vhost config for riot domains
+  copy:
+    src: configs/matrix/vhost-riot
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}"
   loop: "{{ services.riot.domains }}"
 
@@ -58,8 +58,8 @@
     dest: "{{ services.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: "{{ services.matrix.volume_folder }}/data/matrix.data.coop.log.config"
 
 - name: set up matrix and riot

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: "{{ services.privatebin.volume_folder }}/cfg/conf.php"
 
 - name: privatebin app container