From f6652ad51cad039be284841822c1ecb6f1b212d8 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Tue, 2 Jan 2024 21:40:48 +0100
Subject: [PATCH] Adapted variables for template

---
 roles/docker-akaunting/templates/docker-compose.yml.j2      | 2 +-
 roles/docker-attendize/templates/docker-compose.yml.j2      | 2 +-
 roles/docker-baserow/templates/docker-compose.yml.j2        | 2 +-
 roles/docker-funkwhale/templates/docker-compose.yml.j2      | 2 +-
 roles/docker-gitlab/templates/docker-compose.yml.j2         | 2 +-
 roles/docker-joomla/templates/docker-compose.yml.j2         | 2 +-
 roles/docker-listmonk/templates/docker-compose.yml.j2       | 2 +-
 roles/docker-mailu/templates/docker-compose.yml.j2          | 2 +-
 roles/docker-mastodon/templates/docker-compose.yml.j2       | 2 +-
 roles/docker-matomo/templates/docker-compose.yml.j2         | 2 +-
 roles/docker-matrix-compose/templates/docker-compose.yml.j2 | 2 +-
 roles/docker-mybb/templates/docker-compose.yml.j2           | 2 +-
 roles/docker-nextcloud/templates/docker-compose.yml.j2      | 2 +-
 roles/docker-openproject/templates/docker-compose.yml.j2    | 2 +-
 roles/docker-peertube/templates/docker-compose.yml.j2       | 2 +-
 roles/docker-pixelfed/templates/docker-compose.yml.j2       | 2 +-
 roles/docker-wordpress/templates/docker-compose.yml.j2      | 2 +-
 roles/docker-yourls/templates/docker-compose.yml.j2         | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/roles/docker-akaunting/templates/docker-compose.yml.j2 b/roles/docker-akaunting/templates/docker-compose.yml.j2
index eacfde2c..fad87f5e 100644
--- a/roles/docker-akaunting/templates/docker-compose.yml.j2
+++ b/roles/docker-akaunting/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   application:
     image: docker.io/akaunting/akaunting:{{version_akaunting}}
diff --git a/roles/docker-attendize/templates/docker-compose.yml.j2 b/roles/docker-attendize/templates/docker-compose.yml.j2
index f2abd562..310aa3d9 100644
--- a/roles/docker-attendize/templates/docker-compose.yml.j2
+++ b/roles/docker-attendize/templates/docker-compose.yml.j2
@@ -25,7 +25,7 @@ services:
       - .:/usr/share/nginx/html
       - .:/var/www
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   maildev:
     image: maildev/maildev
diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2
index f168ac23..580b1864 100644
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -17,7 +17,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
diff --git a/roles/docker-funkwhale/templates/docker-compose.yml.j2 b/roles/docker-funkwhale/templates/docker-compose.yml.j2
index 1190dfdf..e29cb1ba 100644
--- a/roles/docker-funkwhale/templates/docker-compose.yml.j2
+++ b/roles/docker-funkwhale/templates/docker-compose.yml.j2
@@ -63,7 +63,7 @@ services:
       - "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
 {% include 'templates/docker-container-networks.yml.j2' %}
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2
index 1b41225a..f208127f 100644
--- a/roles/docker-gitlab/templates/docker-compose.yml.j2
+++ b/roles/docker-gitlab/templates/docker-compose.yml.j2
@@ -41,7 +41,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:
diff --git a/roles/docker-joomla/templates/docker-compose.yml.j2 b/roles/docker-joomla/templates/docker-compose.yml.j2
index c04eaa9a..4ef8ffcb 100644
--- a/roles/docker-joomla/templates/docker-compose.yml.j2
+++ b/roles/docker-joomla/templates/docker-compose.yml.j2
@@ -21,7 +21,7 @@ services:
     depends_on:
       database:
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
diff --git a/roles/docker-listmonk/templates/docker-compose.yml.j2 b/roles/docker-listmonk/templates/docker-compose.yml.j2
index 124c1951..9b62d378 100644
--- a/roles/docker-listmonk/templates/docker-compose.yml.j2
+++ b/roles/docker-listmonk/templates/docker-compose.yml.j2
@@ -14,6 +14,6 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
 {% include 'templates/docker-container-depends-on.yml.j2' %}
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/docker-mailu/templates/docker-compose.yml.j2
index e40d1bbb..1a2caa38 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -4,7 +4,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   # Core services
   resolver:
diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/docker-mastodon/templates/docker-compose.yml.j2
index ea67bfbd..8b714a50 100644
--- a/roles/docker-mastodon/templates/docker-compose.yml.j2
+++ b/roles/docker-mastodon/templates/docker-compose.yml.j2
@@ -3,7 +3,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   web:
     image: tootsuite/mastodon:{{version_mastodon}}
diff --git a/roles/docker-matomo/templates/docker-compose.yml.j2 b/roles/docker-matomo/templates/docker-compose.yml.j2
index 73fed493..5b48e0f9 100644
--- a/roles/docker-matomo/templates/docker-compose.yml.j2
+++ b/roles/docker-matomo/templates/docker-compose.yml.j2
@@ -19,7 +19,7 @@ services:
 {% if not enable_central_database %}
     depends_on:
       - database
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% endif %}
 
diff --git a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
index 41984c1c..55fe6e8a 100644
--- a/roles/docker-matrix-compose/templates/docker-compose.yml.j2
+++ b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
@@ -19,7 +19,7 @@ services:
 {% if not enable_central_database %}
     depends_on:
       - database
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 {% endif %}
   
   element:
diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2
index 9eb16858..b8942f35 100644
--- a/roles/docker-mybb/templates/docker-compose.yml.j2
+++ b/roles/docker-mybb/templates/docker-compose.yml.j2
@@ -26,7 +26,7 @@ services:
     - "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
     - "data:/var/www/html:ro"
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
\ No newline at end of file
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/docker-nextcloud/templates/docker-compose.yml.j2
index ebd23ae9..b8327bab 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -17,7 +17,7 @@ services:
     depends_on:
       - database
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 {% endif %}
 
   web:
diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2
index 7547f7ad..00db4d24 100644
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -33,7 +33,7 @@ x-op-app: &app
 
 services:
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
     networks:
       - backend
 
diff --git a/roles/docker-peertube/templates/docker-compose.yml.j2 b/roles/docker-peertube/templates/docker-compose.yml.j2
index 4090308d..b505b593 100644
--- a/roles/docker-peertube/templates/docker-compose.yml.j2
+++ b/roles/docker-peertube/templates/docker-compose.yml.j2
@@ -18,7 +18,7 @@ services:
 {% if not enable_central_database %}
       - database
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 {% endif %}
 
 {% include 'templates/docker-service-redis.yml.j2' %}
diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/docker-pixelfed/templates/docker-compose.yml.j2
index 768a2ee4..50b69427 100644
--- a/roles/docker-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '2'
 
 services:
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
diff --git a/roles/docker-wordpress/templates/docker-compose.yml.j2 b/roles/docker-wordpress/templates/docker-compose.yml.j2
index 46e26ca4..b05a95e0 100644
--- a/roles/docker-wordpress/templates/docker-compose.yml.j2
+++ b/roles/docker-wordpress/templates/docker-compose.yml.j2
@@ -21,7 +21,7 @@ services:
     depends_on:
       - database
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 {% endif %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/docker-yourls/templates/docker-compose.yml.j2
index 53acf9fd..90c64662 100644
--- a/roles/docker-yourls/templates/docker-compose.yml.j2
+++ b/roles/docker-yourls/templates/docker-compose.yml.j2
@@ -20,7 +20,7 @@ services:
     depends_on:
       - database
 
-{% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 volumes:
   database: