Implemented helper role docker-central-database and refactored code

roles/docker-mailu/tasks/main.yml

@@ -1,15 +1,16 @@
 ---
-- name: "include docker/compose/database.yml"
-  include_tasks: docker/compose/database.yml
+- name: "include docker-central-database"
+  include_role: 
+    name: docker-central-database
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
   vars:
     nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size 31M;"
 
-- name: "create {{docker_compose_instance_directory}}"
+- name: "create {{docker_compose.directories.instance}}"
   file:
-    path: "{{docker_compose_instance_directory}}"
+    path: "{{docker_compose.directories.instance}}"
     state: directory
     mode: 0755
 
@@ -26,13 +27,13 @@
 - name: add docker-compose.yml
   template: 
     src:  "docker-compose.yml.j2" 
-    dest: "{{docker_compose_instance_directory}}docker-compose.yml"
+    dest: "{{docker_compose.directories.instance}}docker-compose.yml"
   notify: docker compose project setup
 
 - name: add .env
   template: 
     src:  "env.j2" 
-    dest: "{{docker_compose_instance_directory}}.env"
+    dest: "{{docker_compose.directories.instance}}.env"
   notify: docker compose project setup
 
 - name: flush docker service
@@ -42,6 +43,6 @@
 - name: execute database migration
   command:
     cmd: "docker compose -p mailu exec admin flask mailu admin admin {{primary_domain}} {{mailu_initial_root_password}}"
-    chdir: "{{docker_compose_instance_directory}}"
+    chdir: "{{docker_compose.directories.instance}}"
   ignore_errors: true
   when: mode_setup |bool 

roles/docker-mailu/templates/docker-compose.yml.j2

@@ -2,7 +2,7 @@ services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}
 
-{% include 'templates/docker/services/' + database_type + '.yml.j2' %}
+{% include 'roles/docker-central-database/templates/services/' + database_type + '.yml.j2' %}
 
   # Core services
   resolver:

roles/docker-mailu/vars/main.yml

@@ -1,5 +1,5 @@
 application_id:               "mailu"
 database_password:  	        "{{mailu_database_password}}"
 database_type:                "mariadb"
-cert_mount_directory:         "{{docker_compose_instance_directory}}/certs/"
+cert_mount_directory:         "{{docker_compose.directories.instance}}/certs/"
 enable_wildcard_certificate:  false