Changed roles to new docker backup procedure

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

@@ -20,25 +20,8 @@ services:
       - resolver
     dns:
       - 192.168.203.254
-  
-  database:
-    image: mariadb
-    restart: always
-    environment:
-      MYSQL_DATABASE: "mailu"
-      MYSQL_USER: "mailu"
-      MYSQL_PASSWORD: "{{mailu_database_password}}"
-      MYSQL_ROOT_PASSWORD: "{{mailu_database_password}}"
-      MARIADB_AUTO_UPGRADE: "1"
-    volumes:
-      - database:/var/lib/mysql
-    healthcheck:
-      test: "/usr/bin/mariadb --user=mailu --password={{mailu_database_password}} --execute \"SHOW DATABASES;\""
-      interval: 3s
-      timeout: 1s
-      retries: 5
-    logging:
-      driver: journald
+
+{% include 'templates/docker-mariadb-service.yml.j2' %}  
     depends_on:
       - resolver
     dns:

roles/docker-mailu/templates/mailu.env.j2

@@ -140,15 +140,15 @@ LOG_LEVEL=WARNING
 # Database settings
 ###################################
 DB_FLAVOR=mysql
-DB_USER=mailu
-DB_PW={{mailu_database_password}}
-DB_HOST=database:3306
-DB_NAME=mailu
+DB_USER={{database_username}}
+DB_PW={{database_password}}
+DB_HOST={{database_host}}:3306
+DB_NAME={{database_databasename}}
 ROUNDCUBE_DB_FLAVOR=mysql
-ROUNDCUBE_DB_USER=mailu
-ROUNDCUBE_DB_PW={{mailu_database_password}}
-ROUNDCUBE_DB_NAME=mailu
-ROUNDCUBE_DB_HOST=database:3306
+ROUNDCUBE_DB_USER={{database_username}}
+ROUNDCUBE_DB_PW={{database_password}}
+ROUNDCUBE_DB_NAME={{database_databasename}}
+ROUNDCUBE_DB_HOST={{database_host}}:3306
 
 
 API_TOKEN={{mailu_api_token}}

roles/docker-mailu/vars/main.yml

@@ -1 +1,6 @@
-docker_compose_instance_directory: "{{path_docker_compose_instances}}mailu/"
+docker_compose_instance_directory: "{{path_docker_compose_instances}}mailu/"
+database_instance:  	"mailu"
+database_host:      	"database"
+database_databasename:  "{{database_instance}}"
+database_username:  	"{{database_instance}}"
+database_password:  	"{{mailu_database_password}}"