group_vars/all

@@ -1,7 +1,6 @@
 # General
-verbose:              false       # Prints well formated debug information
-top_domain:           "localhost"
-backups_folder_path:  "/Backups/"
+verbose:      false       # Prints well formated debug information
+top_domain:   "localhost"
 
 # Server Tact Variables 
 

roles/docker-akaunting/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-akaunting/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-attendize/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-attendize/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: receive {{ mail_interface_domain }} certificate
   command: certbot certonly --agree-tos --email {{ administrator_email }} --non-interactive --webroot -w /var/lib/letsencrypt/ -d {{ mail_interface_domain }}

roles/docker-baserow/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-baserow/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-bigbluebutton/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-bigbluebutton/tasks/main.yml

@@ -1,11 +1,4 @@
 ---
-- name: include docker vars
-  include_vars: vars/docker-database-service.yml.j2
-
-- name: load docker compose dependencies
-  include_role:
-    name: docker-compose
-
 - name: "include task certbot-matomo.yml"
   include_tasks: certbot-matomo.yml
 

roles/docker-discourse/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- nginx-docker-reverse-proxy

roles/docker-discourse/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-funkwhale/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-funkwhale/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-gitea/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-gitea/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-gitlab/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-gitlab/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-joomla/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-joomla/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-listmonk/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-listmonk/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-mailu/meta/main.yml

@@ -1,2 +1,3 @@
 dependencies:
+- docker-compose
 - systemd-notifier

roles/docker-mailu/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-mariadb/README.md

@@ -24,4 +24,4 @@ Configure the role by setting the required variables. These can be set in the pl
 - `database_password`: The password for the database user.
 
 ## Contributing
-Contributions to this project are welcome. Please submit issues and pull requests with your suggestions.
+Contributions to this project are welcome. Please submit issues and pull requests with your suggestions.

roles/docker-mariadb/tasks/main.yml

@@ -4,11 +4,6 @@
     state: present
   when: run_once_docker_mariadb is not defined
 
-- name: Create a volume for MariaDB socket
-  docker_volume:
-    name: mariadb_socket
-  when: run_once_docker_mariadb is not defined
-
 - name: install MariaDB
   docker_container:
     name: central-mariadb
@@ -20,41 +15,39 @@
     networks:
       - name: central_mariadb_network
     volumes:
-      - central_mariadb_database:/var/lib/mysql
+      - database:/var/lib/mysql
     published_ports:
-      - "127.0.0.1:3306:3306" # can be that this will be removed if all applications use sockets
+      - "127.0.0.1:3306:3306"
     command: "--transaction-isolation=READ-COMMITTED --binlog-format=ROW" #for nextcloud
   when: run_once_docker_mariadb is not defined
 
+- name: wait for availability of mariadb
+  wait_for:
+    host: "127.0.0.1"
+    port: "3306"
+    delay: 0      
+    timeout: 120
+  when: run_once_docker_mariadb is not defined
+
 - name: install python-mysqlclient
   pacman: 
     name: python-mysqlclient
     state: present
   when: run_once_docker_mariadb is not defined
 
-- name: wait for database
-  wait_for:
-    host: 127.0.0.1
-    port: 3306
-    delay: 10
-    timeout: 300
-  when: run_once_docker_mariadb is not defined
-
 - name: create database
   mysql_db:
-    name: "{{ database_databasename }}"
+    name: "{{database_databasename}}"
     state: present
     login_user: root
-    login_password: "{{ central_mariadb_root_password }}"
+    login_password: "{{central_mariadb_root_password}}"
     login_host: 127.0.0.1
     login_port: 3306
 
-
 - name: create database user
   mysql_user:
     name: "{{database_username}}"
     password: "{{database_password}}"
-    host: "%"
     priv: '{{database_databasename}}.*:ALL'
     state: present
     login_user: root

roles/docker-mastodon/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-mastodon/tasks/main.yml

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

roles/docker-matomo/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-matomo/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

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

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

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

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-mediawiki/tasks/main.yml

@@ -20,10 +20,10 @@
         image: mariadb
         environment:
           MYSQL_DATABASE: mediawiki
-          MYSQL_ROOT_PASSWORD: "{{mediawiki_database_password}}"
+          MYSQL_ROOT_PASSWORD: "{{mediawiki_mysql_user_password}}"
           MYSQL_USER: mediawiki
-          MYSQL_PASSWORD: "{{mediawiki_database_password}}"
+          MYSQL_PASSWORD: "{{mediawiki_mysql_user_password}}"
           MARIADB_AUTO_UPGRADE: "1"
         volumes:
-          - database:/var/lib/mysql
+          - mediawiki-database:/var/lib/mysql
         restart: always

roles/docker-mybb/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-mybb/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks create-proxy-with-domain-replace.yml"
   include_tasks: create-proxy-with-domain-replace.yml

roles/docker-nextcloud/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-nextcloud/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include task certbot-matomo.yml"
   include_tasks: certbot-matomo.yml

roles/docker-openproject/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-openproject/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-peertube/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-peertube/tasks/main.yml

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

roles/docker-pixelfed/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-pixelfed/tasks/main.yml

@@ -1,6 +1,11 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

roles/docker-wordpress/meta/main.yml

@@ -0,0 +1,2 @@
+dependencies:
+- docker-compose

roles/docker-wordpress/tasks/main.yml

@@ -1,7 +1,12 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
-  
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
+
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml
   loop: "{{ domains }}"

roles/docker-yourls/tasks/main.yml

@@ -1,6 +1,15 @@
 ---
-- name: "include docker-compose-common.yml"
-  include_tasks: docker-compose-common.yml
+- name: include docker vars
+  include_vars: vars/docker-database-service.yml.j2
+
+- name: load docker compose dependencies
+  include_role:
+    name: docker-compose
+
+- name: create central database
+  include_role:
+    name: docker-{{database_type}}
+  when: enable_central_database | bool
 
 - name: "include tasks nginx-docker-proxy-domain.yml"
   include_tasks: nginx-docker-proxy-domain.yml

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

@@ -12,14 +12,13 @@ services:
     ports:
       - "127.0.0.1:{{http_port}}:80"
     environment:
-      YOURLS_DB_HOST: "{{database_host}}"
-      YOURLS_DB_USER: "{{database_username}}"
-      YOURLS_DB_PASS: "{{database_password}}"
-      YOURLS_DB_NAME: "{{database_databasename}}"
+      YOURLS_DB_HOST: "database:3306"
+      YOURLS_DB_USER: "yourls"
+      YOURLS_DB_PASS: "{{yourls_database_password}}"
+      YOURLS_DB_NAME: "yourls"
       YOURLS_SITE: "https://{{domain}}"
       YOURLS_USER: "{{yourls_user}}"
       YOURLS_PASS: "{{yourls_user_password}}"
-
 {% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
 {% include 'templates/docker-container-networks.yml.j2' %}
 

tasks/docker-compose-common.yml

@@ -1,11 +0,0 @@
-- name: include docker vars
-  include_vars: vars/docker-database-service.yml.j2
-
-- name: load docker compose dependencies
-  include_role:
-    name: docker-compose
-
-- name: create central database
-  include_role:
-    name: docker-{{database_type}}
-  when: enable_central_database | bool

templates/docker-container-depends-on-database-redis.yml.j2

@@ -5,4 +5,4 @@
         condition: service_healthy
 {% endif %}
       redis:
-        condition: service_healthy
+        condition: service_healthy