From 3f0c16362a00603391106f63b9186fc244a8d338 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Tue, 6 Dec 2022 19:04:37 +0100
Subject: [PATCH] Move Jinja2 templates to templates directory

---
 roles/docker/tasks/services/mastodon.yml                  | 8 ++++----
 roles/docker/tasks/services/matrix_riot.yml               | 8 ++++----
 roles/docker/tasks/services/nextcloud.yml                 | 4 ++--
 roles/docker/tasks/services/rallly.yml                    | 2 +-
 .../mastodon/env_file.j2 => templates/mastodon.env.j2}    | 0
 .../matrix.homeserver.yaml.j2}                            | 0
 .../rallly/env_file.j2 => templates/rallly.env.j2}        | 0
 .../riot/config.json => templates/riot.config.json.j2}    | 0
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename roles/docker/{files/configs/mastodon/env_file.j2 => templates/mastodon.env.j2} (100%)
 rename roles/docker/{files/configs/matrix/homeserver.yaml.j2 => templates/matrix.homeserver.yaml.j2} (100%)
 rename roles/docker/{files/configs/rallly/env_file.j2 => templates/rallly.env.j2} (100%)
 rename roles/docker/{files/configs/riot/config.json => templates/riot.config.json.j2} (100%)

diff --git a/roles/docker/tasks/services/mastodon.yml b/roles/docker/tasks/services/mastodon.yml
index eae1546..905ee0a 100644
--- a/roles/docker/tasks/services/mastodon.yml
+++ b/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
diff --git a/roles/docker/tasks/services/matrix_riot.yml b/roles/docker/tasks/services/matrix_riot.yml
index 4bb9077..b7f952f 100644
--- a/roles/docker/tasks/services/matrix_riot.yml
+++ b/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
diff --git a/roles/docker/tasks/services/nextcloud.yml b/roles/docker/tasks/services/nextcloud.yml
index d36f8de..edfe3fe 100644
--- a/roles/docker/tasks/services/nextcloud.yml
+++ b/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"
 
diff --git a/roles/docker/tasks/services/rallly.yml b/roles/docker/tasks/services/rallly.yml
index b5e9d2f..e26f276 100644
--- a/roles/docker/tasks/services/rallly.yml
+++ b/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
diff --git a/roles/docker/files/configs/mastodon/env_file.j2 b/roles/docker/templates/mastodon.env.j2
similarity index 100%
rename from roles/docker/files/configs/mastodon/env_file.j2
rename to roles/docker/templates/mastodon.env.j2
diff --git a/roles/docker/files/configs/matrix/homeserver.yaml.j2 b/roles/docker/templates/matrix.homeserver.yaml.j2
similarity index 100%
rename from roles/docker/files/configs/matrix/homeserver.yaml.j2
rename to roles/docker/templates/matrix.homeserver.yaml.j2
diff --git a/roles/docker/files/configs/rallly/env_file.j2 b/roles/docker/templates/rallly.env.j2
similarity index 100%
rename from roles/docker/files/configs/rallly/env_file.j2
rename to roles/docker/templates/rallly.env.j2
diff --git a/roles/docker/files/configs/riot/config.json b/roles/docker/templates/riot.config.json.j2
similarity index 100%
rename from roles/docker/files/configs/riot/config.json
rename to roles/docker/templates/riot.config.json.j2