roles/docker/tasks/services/mastodon.yml

@@ -14,17 +14,17 @@
 
 - name: Copy mastodon environment file
   template:
-    src: files/configs/mastodon/env_file.j2
+    src: mastodon.env.j2
     dest: "{{ services.mastodon.volume_folder }}/env_file"
 
 - name: Upload vhost config for root domain
-  template:
-    src: files/configs/mastodon/vhost-mastodon
+  copy:
+    src: configs/mastodon/vhost-mastodon
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
 
 - name: Copy PostgreSQL config
   copy:
-    src: files/configs/mastodon/postgresql.conf
+    src: configs/mastodon/postgresql.conf
     dest: "{{ services.mastodon.volume_folder }}/postgres_config/postgresql.conf"
 
 - name: Set up Mastodon

roles/docker/tasks/services/matrix_riot.yml

@@ -27,8 +27,8 @@
     loop_var: volume
 
 - name: upload riot config.json
-  copy:
-    src: configs/riot/config.json
+  template:
+    src: riot.config.json.j2
     dest: "{{ services.riot.volume_folder }}/data/config.json"
 
 - name: upload riot.im.conf
@@ -54,12 +54,12 @@
 
 - name: upload homeserver.yaml
   template:
-    src: "files/configs/matrix/homeserver.yaml.j2"
+    src: matrix.homeserver.yaml.j2
     dest: "{{ services.matrix.volume_folder }}/data/homeserver.yaml"
 
 - name: upload matrix logging config
   copy:
-    src: "configs/matrix/matrix.data.coop.log.config"
+    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/nextcloud.yml

@@ -1,7 +1,7 @@
 ---
 - name: upload vhost config for cloud.data.coop
-  template:
-    src: files/configs/nextcloud/vhost
+  copy:
+    src: configs/nextcloud/vhost
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
   notify: "restart nginx"
 

roles/docker/tasks/services/rallly.yml

@@ -5,7 +5,7 @@
 
 - name: Copy Rallly environment file
   template:
-    src: files/configs/rallly/env_file.j2
+    src: rallly.env.j2
     dest: "{{ services.rallly.volume_folder }}/env_file"
 
 - name: Set up Rallly