From dc218769c44e809afd143e05162c477bf29c3869 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Tue, 2 Jan 2024 21:39:17 +0100
Subject: [PATCH] Renamed templates

---
 .../templates/docker-compose.yml.j2           |  9 +++---
 .../templates/docker-compose.yml.j2           | 19 ++++++-------
 .../templates/docker-compose.yml.j2           | 11 ++++----
 .../templates/docker-compose.yml.j2           | 21 +++++++-------
 .../templates/docker-compose.yml.j2           |  9 +++---
 .../templates/docker-compose.yml.j2           |  5 ++--
 .../templates/docker-compose.yml.j2           |  9 +++---
 .../templates/docker-compose.yml.j2           |  6 ++--
 .../templates/docker-compose.yml.j2           | 28 +++++++++----------
 .../templates/docker-compose.yml.j2           | 19 ++++++-------
 .../templates/docker-compose.yml.j2           |  4 +--
 .../templates/docker-compose.yml.j2           |  3 +-
 .../templates/docker-compose.yml.j2           |  3 +-
 .../templates/docker-compose.yml.j2           |  8 +++---
 .../templates/docker-compose.yml.j2           |  9 +++---
 .../templates/docker-compose.yml.j2           |  6 ++--
 .../templates/docker-compose.yml.j2           |  9 +++---
 .../templates/docker-compose.yml.j2           |  3 +-
 ....yml.j2 => docker-compose-networks.yml.j2} |  0
 ...e.yml.j2 => docker-compose-volumes.yml.j2} |  1 +
 ....j2 => docker-container-depends-on.yml.j2} |  0
 ...ml.j2 => docker-container-networks.yml.j2} |  0
 .../docker-network-for-container-add.yml.j2   |  0
 ...e.yml.j2 => docker-service-mariadb.yml.j2} |  0
 ....yml.j2 => docker-service-postgres.yml.j2} |  0
 ...ice.yml.j2 => docker-service-redis.yml.j2} |  0
 26 files changed, 85 insertions(+), 97 deletions(-)
 rename templates/{docker-networks-for-role.yml.j2 => docker-compose-networks.yml.j2} (100%)
 rename templates/{docker-database-volume.yml.j2 => docker-compose-volumes.yml.j2} (86%)
 rename templates/{docker-depends-on-central-database.yml.j2 => docker-container-depends-on.yml.j2} (100%)
 rename templates/{docker-networks-for-container.yml.j2 => docker-container-networks.yml.j2} (100%)
 delete mode 100644 templates/docker-network-for-container-add.yml.j2
 rename templates/{docker-mariadb-service.yml.j2 => docker-service-mariadb.yml.j2} (100%)
 rename templates/{docker-postgres-service.yml.j2 => docker-service-postgres.yml.j2} (100%)
 rename templates/{docker-redis-service.yml.j2 => docker-service-redis.yml.j2} (100%)

diff --git a/roles/docker-akaunting/templates/docker-compose.yml.j2 b/roles/docker-akaunting/templates/docker-compose.yml.j2
index 3d2aaafd..eacfde2c 100644
--- a/roles/docker-akaunting/templates/docker-compose.yml.j2
+++ b/roles/docker-akaunting/templates/docker-compose.yml.j2
@@ -17,11 +17,10 @@ services:
       - env/run.env
     environment:
       - AKAUNTING_SETUP
-{% include 'templates/docker-networks-for-container.yml.j2' %}
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
-{% include 'templates/docker-database-volume.yml.j2' %}
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-attendize/templates/docker-compose.yml.j2 b/roles/docker-attendize/templates/docker-compose.yml.j2
index 75d8a8f7..f2abd562 100644
--- a/roles/docker-attendize/templates/docker-compose.yml.j2
+++ b/roles/docker-attendize/templates/docker-compose.yml.j2
@@ -7,20 +7,20 @@ services:
     volumes:
       - .:/usr/share/nginx/html
       - .:/var/www
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       maildev:
       redis:
       worker:
     env_file:
       - ./.env
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   worker:
     image: attendize_worker:latest
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       maildev:
       redis:
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
     volumes:
       - .:/usr/share/nginx/html
       - .:/var/www
@@ -31,13 +31,12 @@ services:
     image: maildev/maildev
     ports:
       - "{{ mail_interface_http_port }}:1080"
-{% include 'templates/docker-networks-for-container.yml.j2' %}
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:
-{% include 'templates/docker-database-volume.yml.j2' %}
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-baserow/templates/docker-compose.yml.j2 b/roles/docker-baserow/templates/docker-compose.yml.j2
index b36e0e63..f168ac23 100644
--- a/roles/docker-baserow/templates/docker-compose.yml.j2
+++ b/roles/docker-baserow/templates/docker-compose.yml.j2
@@ -12,16 +12,15 @@ services:
       - data:/baserow/data
     ports:
       - "{{http_port}}:80"
-{% include 'templates/docker-networks-for-container.yml.j2' %}
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
   redis:
-{% include 'templates/docker-database-volume.yml.j2' %}
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-funkwhale/templates/docker-compose.yml.j2 b/roles/docker-funkwhale/templates/docker-compose.yml.j2
index e114e40f..1190dfdf 100644
--- a/roles/docker-funkwhale/templates/docker-compose.yml.j2
+++ b/roles/docker-funkwhale/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: "3"
 
 services:
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
     env_file: .env
 
@@ -10,7 +10,7 @@ services:
     restart: always
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     depends_on:
-{% include 'templates/docker-depends-on-central-database.yml.j2' %} 
+{% include 'templates/docker-container-depends-on.yml.j2' %} 
       - redis
     env_file: .env
     command: celery -A funkwhale_api.taskapp worker -l INFO --concurrency=${CELERYD_CONCURRENCY-0}
@@ -18,24 +18,24 @@ services:
       - C_FORCE_ROOT=true
     volumes:
       - "data:${MEDIA_ROOT}"
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
 
   celerybeat:
     restart: always
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     depends_on:
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       - redis
     env_file: .env
     command: celery -A funkwhale_api.taskapp beat --pidfile= -l INFO
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   api:
     restart: always
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     depends_on:
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       - redis
     env_file: .env
     volumes:
@@ -43,7 +43,7 @@ services:
       #- "${STATIC_ROOT}:${STATIC_ROOT}"
     ports:
       - "5000"
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   front:
     restart: always
@@ -61,13 +61,12 @@ services:
     ports:
       # override those variables in your .env file if needed
       - "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
   redis:
-{% include 'templates/docker-database-volume.yml.j2' %}
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/docker-gitea/templates/docker-compose.yml.j2
index cfda365e..5d9604fb 100644
--- a/roles/docker-gitea/templates/docker-compose.yml.j2
+++ b/roles/docker-gitea/templates/docker-compose.yml.j2
@@ -27,11 +27,10 @@ services:
       - data:/data
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
-{% include 'templates/docker-networks-for-container.yml.j2' %}
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
-{% include 'templates/docker-database-volume.yml.j2' %}
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-gitlab/templates/docker-compose.yml.j2 b/roles/docker-gitlab/templates/docker-compose.yml.j2
index 9997658e..1b41225a 100644
--- a/roles/docker-gitlab/templates/docker-compose.yml.j2
+++ b/roles/docker-gitlab/templates/docker-compose.yml.j2
@@ -39,13 +39,12 @@ services:
 {% endif %}
       redis:
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:
   config:
   logs:
   data:
-{% include 'templates/docker-database-volume.yml.j2' %}
diff --git a/roles/docker-joomla/templates/docker-compose.yml.j2 b/roles/docker-joomla/templates/docker-compose.yml.j2
index 5c53ad74..c04eaa9a 100644
--- a/roles/docker-joomla/templates/docker-compose.yml.j2
+++ b/roles/docker-joomla/templates/docker-compose.yml.j2
@@ -11,20 +11,19 @@ services:
       JOOMLA_DB_PASSWORD: "{{database_password}}"
       JOOMLA_DB_NAME: "{{database_databasename}}"
     restart: always
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
     volumes:
       - data:/var/www/html
     ports:
       - "127.0.0.1:{{http_port}}:80"
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 {% if enable_central_database %}
     depends_on:
       database:
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
-volumes:
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
-{% include 'templates/docker-database-volume.yml.j2' %}
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
+{% include 'templates/docker-compose-networks.yml.j2' %}
diff --git a/roles/docker-listmonk/templates/docker-compose.yml.j2 b/roles/docker-listmonk/templates/docker-compose.yml.j2
index d10a9700..124c1951 100644
--- a/roles/docker-listmonk/templates/docker-compose.yml.j2
+++ b/roles/docker-listmonk/templates/docker-compose.yml.j2
@@ -11,9 +11,9 @@ services:
       - TZ=Etc/UTC
     volumes:
       - ./config.toml:/listmonk/config.toml
-{% include 'templates/docker-networks-for-container.yml.j2' %}
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% 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-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% 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 2a186997..e40d1bbb 100644
--- a/roles/docker-mailu/templates/docker-compose.yml.j2
+++ b/roles/docker-mailu/templates/docker-compose.yml.j2
@@ -2,7 +2,7 @@ version: '2.2'
 
 services:
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
@@ -46,7 +46,7 @@ services:
       database:
         condition: service_healthy
 {% endif %}
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
       default:
       webmail:
       radicale:
@@ -64,12 +64,12 @@ services:
       resolver:
       front:
       redis:
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
     logging:
       driver: journald
     dns:
       - 192.168.203.254
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   imap:
     image: ghcr.io/mailu/dovecot:{{version_mailu}}
@@ -85,7 +85,7 @@ services:
       - 192.168.203.254
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   smtp:
     image: ghcr.io/mailu/postfix:{{version_mailu}}
@@ -101,7 +101,7 @@ services:
       - 192.168.203.254
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   oletools:
     image: ghcr.io/mailu/oletools:{{version_mailu}}
@@ -111,7 +111,7 @@ services:
       - resolver
     dns:
       - 192.168.203.254
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
       noinet:
 
   antispam:
@@ -131,7 +131,7 @@ services:
       - 192.168.203.254
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
       default:
       noinet:  
 
@@ -149,7 +149,7 @@ services:
       - 192.168.203.254
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   webdav:
     image: ghcr.io/mailu/radicale:{{version_mailu}}
@@ -165,7 +165,7 @@ services:
       - resolver
     dns:
       - 192.168.203.254
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   fetchmail:
     image: ghcr.io/mailu/fetchmail:{{version_mailu}}
@@ -182,7 +182,7 @@ services:
       - resolver
     dns:
       - 192.168.203.254
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   webmail:
     image: ghcr.io/mailu/webmail:{{version_mailu}}
@@ -199,11 +199,11 @@ services:
       driver: journald
     dns:
       - 192.168.203.254
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
       webmail:
 
 volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   smtp_queue:
   admin_data:
   webdav_data:
@@ -213,7 +213,7 @@ volumes:
   dovecot_mail:
   redis:
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
+{% include 'templates/docker-compose-networks.yml.j2' %}
   default:
     driver: bridge
     ipam:
diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/docker-mastodon/templates/docker-compose.yml.j2
index c5fb0b02..ea67bfbd 100644
--- a/roles/docker-mastodon/templates/docker-compose.yml.j2
+++ b/roles/docker-mastodon/templates/docker-compose.yml.j2
@@ -1,7 +1,7 @@
 version: '3'
 services:
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
@@ -15,14 +15,14 @@ services:
     ports:
       - "127.0.0.1:{{http_port}}:3000"
     depends_on:
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       redis:
         condition: service_healthy
     volumes:
       - data:/mastodon/public/system
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   streaming:
     image: tootsuite/mastodon:{{version_mastodon}}
@@ -33,12 +33,12 @@ services:
       test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
     ports:
       - "127.0.0.1:{{stream_port}}:4000"
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       redis:
         condition: service_healthy
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
   sidekiq:
     image: tootsuite/mastodon:{{version_mastodon}}
@@ -46,7 +46,7 @@ services:
     env_file: .env.production
     command: bundle exec sidekiq
     depends_on:
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       redis:
         condition: service_healthy
     volumes:
@@ -55,11 +55,10 @@ services:
       test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]
     logging:
       driver: journald
-{% include 'templates/docker-networks-for-container.yml.j2' %}
+{% include 'templates/docker-container-networks.yml.j2' %}
 
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:
   data:
 
-{% include 'templates/docker-networks-for-role.yml.j2' %}
\ No newline at end of file
+{% include 'templates/docker-compose-networks.yml.j2' %}
\ No newline at end of file
diff --git a/roles/docker-matomo/templates/docker-compose.yml.j2 b/roles/docker-matomo/templates/docker-compose.yml.j2
index 877a8214..73fed493 100644
--- a/roles/docker-matomo/templates/docker-compose.yml.j2
+++ b/roles/docker-matomo/templates/docker-compose.yml.j2
@@ -22,6 +22,6 @@ services:
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
 {% endif %}
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
diff --git a/roles/docker-matrix-compose/templates/docker-compose.yml.j2 b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
index 0eb84e32..41984c1c 100644
--- a/roles/docker-matrix-compose/templates/docker-compose.yml.j2
+++ b/roles/docker-matrix-compose/templates/docker-compose.yml.j2
@@ -59,8 +59,7 @@ services:
   #  volumes:
   #  - instagram_bridge_data:/data  
 
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   synapse_data:
   #telegram_bridge_data:
   #whatsapp_bridge_data:
diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2
index 54adad97..9eb16858 100644
--- a/roles/docker-mybb/templates/docker-compose.yml.j2
+++ b/roles/docker-mybb/templates/docker-compose.yml.j2
@@ -28,6 +28,5 @@ services:
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
-volumes:
-{% include 'templates/docker-database-volume.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 e31f3bfe..ebd23ae9 100644
--- a/roles/docker-nextcloud/templates/docker-compose.yml.j2
+++ b/roles/docker-nextcloud/templates/docker-compose.yml.j2
@@ -34,7 +34,7 @@ services:
     volumes_from:
       - application
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
   cron:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
@@ -44,9 +44,9 @@ services:
     volumes:
       - data:/var/www/html
     entrypoint: /cron.sh
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       redis:
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
   redis:
diff --git a/roles/docker-openproject/templates/docker-compose.yml.j2 b/roles/docker-openproject/templates/docker-compose.yml.j2
index 8c2fab30..7547f7ad 100644
--- a/roles/docker-openproject/templates/docker-compose.yml.j2
+++ b/roles/docker-openproject/templates/docker-compose.yml.j2
@@ -4,8 +4,7 @@ networks:
   frontend:
   backend:
 
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
 
 x-op-restart-policy: &restart_policy
@@ -68,7 +67,7 @@ services:
     networks:
       - frontend
       - backend
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       cache:
       seeder:
     labels:
@@ -94,7 +93,7 @@ services:
     command: "./docker/prod/worker"
     networks:
       - backend
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       cache:
       seeder:
 
@@ -103,7 +102,7 @@ services:
     command: "./docker/prod/cron"
     networks:
       - backend
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       cache:
       seeder:
 
diff --git a/roles/docker-peertube/templates/docker-compose.yml.j2 b/roles/docker-peertube/templates/docker-compose.yml.j2
index 1c1fcb4c..4090308d 100644
--- a/roles/docker-peertube/templates/docker-compose.yml.j2
+++ b/roles/docker-peertube/templates/docker-compose.yml.j2
@@ -21,13 +21,13 @@ services:
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 {% endif %}
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
     env_file:
       - .env
-volumes:
+
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   assets:
-{% include 'templates/docker-database-volume.yml.j2' %}
   data:
   redis:
   config:
\ No newline at end of file
diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/docker-pixelfed/templates/docker-compose.yml.j2
index 6bf2e273..768a2ee4 100644
--- a/roles/docker-pixelfed/templates/docker-compose.yml.j2
+++ b/roles/docker-pixelfed/templates/docker-compose.yml.j2
@@ -4,7 +4,7 @@ services:
 
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 
-{% include 'templates/docker-redis-service.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
 
   application:
     image: zknt/pixelfed
@@ -19,7 +19,7 @@ services:
       - "./env:/var/www/.env"
     ports:
       - "{{http_port}}:80"
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       redis:
   worker:
     image: zknt/pixelfed
@@ -38,12 +38,11 @@ services:
       interval: 60s
       timeout: 5s
       retries: 1
-{% include 'templates/docker-depends-on-central-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       redis:
       application:
 
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:
   application_data:
   bootstrap:
\ No newline at end of file
diff --git a/roles/docker-wordpress/templates/docker-compose.yml.j2 b/roles/docker-wordpress/templates/docker-compose.yml.j2
index ca00691d..46e26ca4 100644
--- a/roles/docker-wordpress/templates/docker-compose.yml.j2
+++ b/roles/docker-wordpress/templates/docker-compose.yml.j2
@@ -24,6 +24,5 @@ services:
 {% include 'templates/docker-{{ database_type }}-service.yml.j2' %}
 {% endif %}
 
-volumes:
-{% include 'templates/docker-database-volume.yml.j2' %}
+{% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
diff --git a/templates/docker-networks-for-role.yml.j2 b/templates/docker-compose-networks.yml.j2
similarity index 100%
rename from templates/docker-networks-for-role.yml.j2
rename to templates/docker-compose-networks.yml.j2
diff --git a/templates/docker-database-volume.yml.j2 b/templates/docker-compose-volumes.yml.j2
similarity index 86%
rename from templates/docker-database-volume.yml.j2
rename to templates/docker-compose-volumes.yml.j2
index 22b28050..a6055f38 100644
--- a/templates/docker-database-volume.yml.j2
+++ b/templates/docker-compose-volumes.yml.j2
@@ -1,3 +1,4 @@
+volumes:
 {% if not enable_central_database %}
   database:
 {% endif %}
\ No newline at end of file
diff --git a/templates/docker-depends-on-central-database.yml.j2 b/templates/docker-container-depends-on.yml.j2
similarity index 100%
rename from templates/docker-depends-on-central-database.yml.j2
rename to templates/docker-container-depends-on.yml.j2
diff --git a/templates/docker-networks-for-container.yml.j2 b/templates/docker-container-networks.yml.j2
similarity index 100%
rename from templates/docker-networks-for-container.yml.j2
rename to templates/docker-container-networks.yml.j2
diff --git a/templates/docker-network-for-container-add.yml.j2 b/templates/docker-network-for-container-add.yml.j2
deleted file mode 100644
index e69de29b..00000000
diff --git a/templates/docker-mariadb-service.yml.j2 b/templates/docker-service-mariadb.yml.j2
similarity index 100%
rename from templates/docker-mariadb-service.yml.j2
rename to templates/docker-service-mariadb.yml.j2
diff --git a/templates/docker-postgres-service.yml.j2 b/templates/docker-service-postgres.yml.j2
similarity index 100%
rename from templates/docker-postgres-service.yml.j2
rename to templates/docker-service-postgres.yml.j2
diff --git a/templates/docker-redis-service.yml.j2 b/templates/docker-service-redis.yml.j2
similarity index 100%
rename from templates/docker-redis-service.yml.j2
rename to templates/docker-service-redis.yml.j2