Adapted variables for template

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}}

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

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:

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:

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:

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:

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' %}

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:

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}}

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 %}
 

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:

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:

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:

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
 

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' %}

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' %}
 

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' %}

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: