Merge branch 'main' into move_templates

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:
+  copy:
-    src: files/configs/mastodon/vhost-mastodon
+    src: configs/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

@@ -28,33 +28,35 @@
 
 - name: upload riot config.json
   template:
-    src: files/configs/riot/config.json
+    src: riot.config.json.j2
     dest: "{{ services.riot.volume_folder }}/data/config.json"
 
 - name: upload riot.im.conf
-  template:
+  copy:
-    src: files/configs/riot/riot.im.conf
+    src: configs/riot/riot.im.conf
     dest: "{{ services.riot.volume_folder }}/data/riot.im.conf"
 
 - name: upload vhost config for matrix domain
-  template:
+  copy:
-    src: files/configs/matrix/vhost-matrix
+    src: configs/vhost/matrix
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.matrix.domain }}"
 
-- name: upload vhost config for riot domain
+- name: upload vhost config for riot domains
-  template:
+  copy:
-    src: files/configs/matrix/vhost-riot
+    src: configs/vhost/riot
-    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ item }}"
+    dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ domain }}"
   loop: "{{ services.riot.domains }}"
+  loop_control:
+    loop_var: domain
 
 - 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
-  template:
+  copy:
-    src: "files/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:
+  copy:
-    src: files/configs/nextcloud/vhost
+    src: configs/vhost/nextcloud
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
   notify: "restart nginx"
 

roles/docker/tasks/services/privatebin.yml

@@ -11,8 +11,8 @@
     loop_var: volume
 
 - name: upload privatebin config
-  template:
+  copy:
-    src: files/configs/privatebin-conf.php
+    src: configs/privatebin/conf.php
     dest: "{{ services.privatebin.volume_folder }}/cfg/conf.php"
 
 - name: privatebin app container

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

roles/docker/tasks/services/websites/data.coop.yml

@@ -1,12 +1,12 @@
 ---
 - name: Upload vhost config for root domain
   copy:
-    src: files/configs/matrix/vhost-root
+    src: configs/vhost/root
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
 
 - name: Upload vhost config for WWW domain
   copy:
-    src: files/configs/vhost-www
+    src: configs/vhost/www
     dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}"
 
 - name: setup data.coop website docker container
@@ -17,8 +17,8 @@
     networks:
       - name: external_services
     env:
-      VIRTUAL_HOST : "{{ services.data_coop_website.domains|join(',') }}"
+      VIRTUAL_HOST : "{{ services.data_coop_website.domains | join(',') }}"
-      LETSENCRYPT_HOST: "{{ services.data_coop_website.domains|join(',') }}"
+      LETSENCRYPT_HOST: "{{ services.data_coop_website.domains | join(',') }}"
       LETSENCRYPT_EMAIL: "{{ letsencrypt_email }}"
     labels:
       com.centurylinklabs.watchtower.enable: "true"