Refactored for simplified use of cleanup parameter

roles/docker-akaunting/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-attendize/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks to receive attendize certbot certificate"
   include_tasks: recieve-certbot-certificate.yml

roles/docker-baserow/tasks/main.yml

@@ -1,15 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
+
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml

roles/docker-bigbluebutton/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
 - name: include docker vars
-  include_vars: vars/docker-database-service.yml.j2
+  include_vars: vars/docker-common.yml.j2
 
 - name: load docker compose dependencies
   include_role:

roles/docker-discourse/tasks/main.yml

@@ -6,18 +6,12 @@
     name: which
     state: present
 
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
-
 - name: "Ensure {{docker_compose_project_name}}_default network exists"
   community.docker.docker_network:
     name: "{{docker_compose_project_name}}_default"

roles/docker-funkwhale/tasks/main.yml

@@ -1,15 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml

roles/docker-gitea/tasks/main.yml

@@ -1,15 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml

roles/docker-gitlab/tasks/main.yml

@@ -1,15 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml

roles/docker-joomla/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
@@ -8,11 +8,6 @@
   loop_control:
     loop_var: domain
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml

roles/docker-listmonk/tasks/main.yml

@@ -1,15 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: 

roles/docker-mailu/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-mastodon/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include create-domains.yml"
   include_tasks: create-domains.yml
@@ -8,12 +8,6 @@
   loop_control:
     loop_var: domain
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
-
 - name: copy docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
   notify: docker compose project setup

roles/docker-matomo/tasks/main.yml

@@ -1,16 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
-
 - name: add docker-compose.yml
   template: 
     src:  "docker-compose.yml.j2" 

roles/docker-matrix-compose/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
@@ -14,11 +14,6 @@
     domain:     "{{element_domain}}"
     http_port:  "{{element_http_port}}"
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 #- name: "create {{docker_compose_instance_directory}}mautrix_whatsapp"
 #  file:

roles/docker-mybb/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks create-proxy-with-domain-replace.yml"
   include_tasks: create-proxy-with-domain-replace.yml

roles/docker-nextcloud/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include task certbot-matomo.yml"
   include_tasks: certbot-matomo.yml
@@ -11,23 +11,12 @@
     dest: "{{nginx_servers_directory}}{{domain}}.conf"
   notify: restart nginx
 
-- name: "create {{path_docker_volumes}}nextcloud/"
-  file:
-    path: "{{path_docker_volumes}}nextcloud"
-    state: directory
-    mode: 0755
-
 - name: configure nginx.conf
   template: 
     src:  "templates/nginx.conf.j2" 
     dest: "{{path_docker_volumes}}nextcloud/nginx.conf"
   notify: docker compose project setup
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: add docker-compose.yml
   template: 

roles/docker-openproject/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-peertube/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
   
 - name: "include create-domains.yml"
   include_tasks: create-domains.yml
@@ -8,11 +8,6 @@
   loop_control:
     loop_var: domain
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: copy docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml

roles/docker-pixelfed/tasks/main.yml

@@ -1,16 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
-
 - name: add docker-compose.yml
   template: src=docker-compose.yml.j2 dest={{docker_compose_instance_directory}}docker-compose.yml
   notify: docker compose project setup

roles/docker-roulette-wheel/tasks/main.yml

@@ -1,12 +1,6 @@
 ---
-- name: "include tasks nginx-docker-proxy-domain.yml"
+- name: "include docker-compose-common.yml"
-  include_tasks: nginx-docker-proxy-domain.yml
+  include_tasks: docker-compose-common.yml
-
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
 
 - name: pull app repository
   git:

roles/docker-wordpress/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
   
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
@@ -10,12 +10,6 @@
   vars:
     nginx_docker_reverse_proxy_extra_configuration: "client_max_body_size {{wordpress_max_upload_size}};"
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
-
 - name: "Transfering upload.ini to {{docker_compose_instance_directory}}"
   template:
     src: upload.ini.j2

roles/docker-yourls/tasks/main.yml

@@ -1,16 +1,10 @@
 ---
-- name: "include docker-compose-common.yml"
+- name: "include docker-compose-database.yml"
-  include_tasks: docker-compose-common.yml
+  include_tasks: docker-compose-database.yml
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
 
-- name: "create {{docker_compose_instance_directory}}"
-  file:
-    path: "{{docker_compose_instance_directory}}"
-    state: directory
-    mode: 0755
-
 - name: add docker-compose.yml
   template: 
     src:  "docker-compose.yml.j2" 

tasks/docker-compose-common.yml

@@ -1,11 +1,18 @@
 - name: include docker vars
-  include_vars: vars/docker-database-service.yml.j2
+  include_vars: vars/docker-common.yml.j2
 
 - name: load docker compose dependencies
   include_role:
     name: docker-compose
 
-- name: create central database
+- name: "remove {{ docker_compose_instance_directory }} and all its contents"
-  include_role:
+  file:
-    name: docker-{{database_type}}
+    path: "{{ docker_compose_instance_directory }}"
-  when: enable_central_database | bool
+    state: absent
+  when: reset_files | bool
+
+- name: "create {{docker_compose_instance_directory}}"
+  file:
+    path: "{{docker_compose_instance_directory}}"
+    state: directory
+    mode: 0755

tasks/docker-compose-database.yml

@@ -0,0 +1,10 @@
+- name: include docker vars/docker-database.yml.j2
+  include_vars: vars/docker-database.yml.j2
+
+- name: "include docker-compose-common.yml"
+  include_tasks: docker-compose-common.yml
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool

vars/docker-common.yml.j2

@@ -0,0 +1 @@
+docker_compose_instance_directory:  "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}"

vars/docker-database.yml.j2

@@ -1,6 +1,5 @@
-docker_compose_instance_directory:  "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}"
 database_instance:                  "{{ 'central-' + database_type if enable_central_database else docker_compose_project_name }}"
 database_host:                      "{{ 'central-' + database_type if enable_central_database else 'database' }}"
-database_name:              "{{ docker_compose_project_name }}"
+database_name:                      "{{ docker_compose_project_name }}"
 database_username:                  "{{ docker_compose_project_name }}"
 database_version:                   "{{ postgres_default_version }}"