constructor.yml

@@ -1,11 +1,20 @@
 ---
+- name:   variable mapping   
+  hosts:  all
+  vars:
+    activate_all_timers:          "{{ activate_all_timers | lower | bool }}"
+    nginx_matomo_tracking:        "{{ nginx_matomo_tracking | lower | bool }}"
+    execute_updates:              "{{ execute_updates | lower | bool }}"
+    force_backup_before_update:   "{{ force_backup_before_update | lower | bool }}"
+    enable_central_database:      "{{ enable_central_database | lower | bool }}"
 
 - name: update device
   hosts:  all
   become: true
+  tasks:
   roles:
     - role: update
-      when: execute_updates | bool
+      when: execute_updates
 
 - name: setup standard wireguard
   hosts: wireguard_server

group_vars/all

@@ -86,9 +86,6 @@ system_maintenance_manipulation_services:
 ## Total System Maintenance Services
 system_maintenance_services: "{{ system_maintenance_backup_services + system_maintenance_cleanup_services + system_maintenance_manipulation_services }}"
 
-### Define Variables for Docker Volume Health services
-whitelisted_anonymous_docker_volumes: []
-
 # Webserver Configuration
 
 ## Nginx-Specific Path Configurations

roles/backup-docker-to-local/tasks/main.yml

@@ -37,7 +37,7 @@
 - name: configure backup-docker-to-local.timer.tpl
   template: src=backup-docker-to-local.timer.j2 dest=/etc/systemd/system/backup-docker-to-local.timer
   register: backup_docker_to_local_timer
-  changed_when: backup_docker_to_local_timer.changed or activate_all_timers | bool
+  changed_when: backup_docker_to_local_timer.changed or activate_all_timers
   notify: restart backup-docker-to-local.timer
   when: run_once_backup_docker_to_local is not defined
 
@@ -46,6 +46,7 @@
     cmd: "python database_entry_seeder.py databases.csv {{docker_compose_project_name}} {{database_host}} {{database_databasename}} {{database_username}} {{database_password}}"
     chdir: "{{backup_docker_to_local_folder}}"
   when: >
+    docker_compose_project_name is defined or
     database_host is defined or
     database_databasename is defined or
     database_username is defined or
@@ -58,7 +59,8 @@
     owner: root
     group: root
   when: >
-    (database_host is defined or
+    (docker_compose_project_name is defined or
+    database_host is defined or
     database_databasename is defined or
     database_username is defined or
     database_password is defined) and

roles/backup-remote-to-local/tasks/main.yml

@@ -17,7 +17,7 @@
 - name: create backup-remote-to-local.timer
   template: src=backup-remote-to-local.timer.j2 dest=/etc/systemd/system/backup-remote-to-local.timer
   register: backup_backup_remote_to_local_timer
-  changed_when: backup_backup_remote_to_local_timer.changed or activate_all_timers | bool
+  changed_when: backup_backup_remote_to_local_timer.changed or activate_all_timers
   notify: restart backup-remote-to-local timer
 
 - name: create backups-remote-to-local.sh

roles/cleanup-backups-timer/tasks/main.yml

@@ -3,7 +3,7 @@
     src:  "cleanup-backups.timer.j2"
     dest: "/etc/systemd/system/cleanup-backups.timer"
   register: cleanup_backups_timer
-  changed_when: cleanup_backups_timer.changed or activate_all_timers | bool
+  changed_when: cleanup_backups_timer.changed or activate_all_timers
   notify: restart cleanup-backups.timer
   when: run_once_cleanup_backups_timer is not defined
 

roles/cleanup-disc-space/tasks/main.yml

@@ -20,5 +20,5 @@
     src: cleanup-disc-space.timer.j2
     dest: /etc/systemd/system/cleanup-disc-space.timer
   register: cleanup_disc_space_timer
-  changed_when: cleanup_disc_space_timer.changed or activate_all_timers | bool
+  changed_when: cleanup_disc_space_timer.changed or activate_all_timers
   notify: restart cleanup-disc-space.timer

roles/cleanup-failed-docker-backups/tasks/main.yml

@@ -24,7 +24,7 @@
     src: cleanup-failed-docker-backups.timer.j2
     dest: /etc/systemd/system/cleanup-failed-docker-backups.timer
   register: cleanup_failed_docker_backups_timer
-  changed_when: cleanup_failed_docker_backups_timer.changed or activate_all_timers | bool
+  changed_when: cleanup_failed_docker_backups_timer.changed or activate_all_timers
   notify: restart cleanup-failed-docker-backups.timer
   when: run_once_cleanup_failed_docker_backups is not defined
 

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

@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
 
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   application:
     image: docker.io/akaunting/akaunting:{{version_akaunting}}
@@ -18,7 +18,7 @@ services:
     environment:
       - AKAUNTING_SETUP
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:

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

@@ -1,10 +1,5 @@
 version: '3.2'
 services:
-
-{% include 'templates/docker-service-redis.yml.j2' %}
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   web:
     image: attendize_web:latest
     ports:
@@ -12,8 +7,9 @@ services:
     volumes:
       - .:/usr/share/nginx/html
       - .:/var/www
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       maildev:
+      redis:
       worker:
     env_file:
       - ./.env
@@ -21,19 +17,24 @@ services:
 
   worker:
     image: attendize_worker:latest
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       maildev:
+      redis:
 {% include 'templates/docker-container-networks.yml.j2' %}
     volumes:
       - .:/usr/share/nginx/html
       - .:/var/www
 
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+
   maildev:
     image: maildev/maildev
     ports:
       - "{{ mail_interface_http_port }}:1080"
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+      
+{% include 'templates/docker-service-redis.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:

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

@@ -1,11 +1,6 @@
 version: '2'
 
 services:
-
-{% include 'templates/docker-service-redis.yml.j2' %}
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   baserow:
     image: baserow/baserow:1.19.1
     restart: always
@@ -18,7 +13,11 @@ services:
     ports:
       - "{{http_port}}:80"
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+
+{% include 'templates/docker-service-redis.yml.j2' %}
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:

roles/docker-bigbluebutton/vars/main.yml

@@ -1,5 +1,6 @@
 docker_compose_project_name:        "bigbluebutton"
-database_host:                      "postgres" # needs to be fixed
+docker_compose_instance_directory:  "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
+database_host:                      "postgres"
 database_databasename:              "greenlight-v3"
 database_username:                  "postgres"
 database_password:  	              ""

roles/docker-discourse/templates/app.yml.j2

@@ -71,13 +71,13 @@ env:
   DISCOURSE_SMTP_DOMAIN:            {{ system_email_domain }}
   DISCOURSE_NOTIFICATION_EMAIL:     {{ system_email }}
 
-{% if enable_central_database | bool %}
+{% if enable_central_database %}
   # Database Configuration
   DISCOURSE_DB_USERNAME: {{ database_username }}
   DISCOURSE_DB_PASSWORD: {{ database_password }}
   DISCOURSE_DB_HOST:     {{ database_host }}
   DISCOURSE_DB_NAME:     {{ database_databasename }}
-{% if enable_central_database | bool %}
+{% if enable_central_database %}
 
   ## If you added the Lets Encrypt template, uncomment below to get a free SSL certificate
   #LETSENCRYPT_ACCOUNT_EMAIL: administrator@veen.world

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

@@ -4,38 +4,45 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
+    env_file: .env
+
   celeryworker:
     restart: always
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
+    depends_on:
+{% 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}
     environment:
       - C_FORCE_ROOT=true
     volumes:
       - "data:${MEDIA_ROOT}"
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
 {% include 'templates/docker-container-networks.yml.j2' %}
 
 
   celerybeat:
     restart: always
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
+    depends_on:
+{% 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-container-depends-on-database-redis.yml.j2' %}
 {% include 'templates/docker-container-networks.yml.j2' %}
 
   api:
     restart: always
     image: funkwhale/api:${FUNKWHALE_VERSION:-latest}
     depends_on:
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+      - redis
     env_file: .env
     volumes:
       - "data:${MEDIA_ROOT}"
       #- "${STATIC_ROOT}:${STATIC_ROOT}"
     ports:
       - "5000"
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
 {% include 'templates/docker-container-networks.yml.j2' %}
 
   front:
@@ -56,6 +63,8 @@ services:
       - "${FUNKWHALE_API_IP}:${FUNKWHALE_API_PORT}:80"
 {% include 'templates/docker-container-networks.yml.j2' %}
 
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
   redis:

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

@@ -1,9 +1,6 @@
 version: '3'
 
 services:
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     logging:
       driver: journald
@@ -31,7 +28,7 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:

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

@@ -1,10 +1,5 @@
 version: '3.6'
 services:
-
-{% include 'templates/docker-service-redis.yml.j2' %}
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   web:
     image: 'gitlab/gitlab-ee:latest'
     restart: always
@@ -37,10 +32,16 @@ services:
       - 'logs:/var/log/gitlab'
       - 'data:/var/opt/gitlab'
     shm_size: '256m'
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+    depends_on:
-{% include 'templates/docker-container-networks.yml.j2' %}
+{% if not enable_central_database %}
+      database:
+        condition: service_healthy
+{% endif %}
+      redis:
 
-{% include 'templates/docker-compose-networks.yml.j2' %}
+{% include 'templates/docker-service-redis.yml.j2' %}
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:

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

@@ -1,9 +1,6 @@
 version: '3'
 
 services:
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     image: joomla
     logging:
@@ -14,12 +11,17 @@ services:
       JOOMLA_DB_PASSWORD: "{{database_password}}"
       JOOMLA_DB_NAME: "{{database_databasename}}"
     restart: always
+{% include 'templates/docker-container-depends-on.yml.j2' %}
     volumes:
       - data:/var/www/html
     ports:
       - "127.0.0.1:{{http_port}}:80"
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if enable_central_database %}
+    depends_on:
+      database:
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:

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

@@ -2,8 +2,6 @@ version: "3.7"
 
 services:
 
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     restart: unless-stopped
     image: listmonk/listmonk:latest
@@ -14,6 +12,8 @@ services:
     volumes:
       - ./config.toml:/listmonk/config.toml
 {% include 'templates/docker-container-networks.yml.j2' %}
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-networks.yml.j2' %}

roles/docker-mailu/tasks/main.yml

@@ -64,5 +64,5 @@
     src:  "deploy-letsencrypt-mailu.timer.j2" 
     dest: "/etc/systemd/system/deploy-letsencrypt-mailu.timer"
   register: deploy_letsencrypt_mailu_timer
-  changed_when: deploy_letsencrypt_mailu_timer.changed or activate_all_timers | bool
+  changed_when: deploy_letsencrypt_mailu_timer.changed or activate_all_timers
   notify: restart deploy-letsencrypt-mailu.timer

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

@@ -4,16 +4,20 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   # Core services
   resolver:
     image: ghcr.io/mailu/unbound:{{version_mailu}}
     env_file: mailu.env
     restart: always
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
       default:
         ipv4_address: 192.168.203.254
+      {{docker_compose_project_name}}_network: 
+{% if enable_central_database %}
+      central_{{ database_type }}_network:
+{% endif %}
     logging:
       driver: journald
 
@@ -35,9 +39,13 @@ services:
     volumes:
       - "/etc/mailu/overrides/nginx:/overrides:ro"
       - "/etc/mailu/certs:/certs"
-{% include 'templates/docker-container-depends-on-also-database.yml.j2' %}
+    depends_on:
       resolver:
         condition: service_started
+{% if not enable_central_database %}
+      database:
+        condition: service_healthy
+{% endif %}
 {% include 'templates/docker-container-networks.yml.j2' %}
       default:
       webmail:
@@ -52,9 +60,11 @@ services:
     volumes:
       - "admin_data:/data"
       - "dkim:/dkim"
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+    depends_on:
       resolver:
       front:
+      redis:
+{% include 'templates/docker-container-depends-on.yml.j2' %}
     logging:
       driver: journald
     dns:
@@ -192,6 +202,7 @@ services:
 {% include 'templates/docker-container-networks.yml.j2' %}
       webmail:
 
+volumes:
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   smtp_queue:
   admin_data:

roles/docker-mailu/vars/main.yml

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

roles/docker-mariadb/tasks/main.yml

@@ -29,12 +29,6 @@
     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: create database
   mysql_db:
     name: "{{database_databasename}}"
@@ -43,6 +37,7 @@
     login_password: "{{central_mariadb_root_password}}"
     login_host: 127.0.0.1
     login_port: 3306
+  listen: create database
 
 - name: create database user
   mysql_user:
@@ -54,6 +49,7 @@
     login_password: "{{central_mariadb_root_password}}"
     login_host: 127.0.0.1
     login_port: 3306
+  listen: create database
 
 - name: run the docker_mariadb tasks once
   set_fact:

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

@@ -3,7 +3,7 @@ services:
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
   web:
     image: tootsuite/mastodon:{{version_mastodon}}
@@ -14,7 +14,10 @@ services:
       test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
     ports:
       - "127.0.0.1:{{http_port}}:3000"
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+    depends_on:
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+      redis:
+        condition: service_healthy
     volumes:
       - data:/mastodon/public/system
     logging:
@@ -30,7 +33,9 @@ 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-container-depends-on-database-redis.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+      redis:
+        condition: service_healthy
     logging:
       driver: journald
 {% include 'templates/docker-container-networks.yml.j2' %}
@@ -40,7 +45,10 @@ services:
     restart: always
     env_file: .env.production
     command: bundle exec sidekiq
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+    depends_on:
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+      redis:
+        condition: service_healthy
     volumes:
       - data:/mastodon/public/system
     healthcheck:

roles/docker-mastodon/templates/mastodon.conf.j2

@@ -8,7 +8,7 @@ server {
 
   {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
 
-  {% if nginx_matomo_tracking | bool %}
+  {% if nginx_matomo_tracking %}
     {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
   {% endif %}
 

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

@@ -1,9 +1,6 @@
 version: '3'
 
 services:
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     logging:
       driver: journald
@@ -19,10 +16,12 @@ services:
       MATOMO_DATABASE_DBNAME: "{{database_databasename}}"
     volumes:
       - data:/var/www/html
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if not enable_central_database %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+    depends_on:
+      - database
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+
+{% endif %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
-
-{% include 'templates/docker-compose-networks.yml.j2' %}

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

@@ -2,8 +2,6 @@ version: '3.1'
 
 services:
   
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   synapse:
     image: matrixdotorg/synapse:latest
     restart: always
@@ -18,8 +16,11 @@ services:
       - SYNAPSE_REPORT_STATS=no
     ports:
       - "127.0.0.1:{{synapse_http_port}}:8008"
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if not enable_central_database %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+    depends_on:
+      - database
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% endif %}
   
   element:
     image: vectorim/element-web:latest
@@ -28,7 +29,6 @@ services:
       - ./element-config.json:/app/config.json
     ports:
       - "127.0.0.1:{{element_http_port}}:80"
-{% include 'templates/docker-container-networks.yml.j2' %}
 
   # bridges
   #mautrix-telegram:
@@ -65,5 +65,3 @@ services:
   #whatsapp_bridge_data:
   #facebook_bridge_data:
   #instagram_bridge_data:
-
-{% include 'templates/docker-compose-networks.yml.j2' %}

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

@@ -1,8 +1,5 @@
 version: '3.8'
 services:
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     logging:
       driver: journald
@@ -12,9 +9,10 @@ services:
     restart: always
     volumes:
       - data:/var/www/html
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if not enable_central_database %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+    depends_on:
-
+      - database
+{% endif %}
   server:
     logging:
       driver: journald
@@ -27,9 +25,8 @@ services:
     volumes:
     - "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro"
     - "data:/var/www/html:ro"
-{% include 'templates/docker-container-networks.yml.j2' %}
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
-
-{% include 'templates/docker-compose-networks.yml.j2' %}

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

@@ -1,11 +1,6 @@
 version: '3'
 
 services:
-
-{% include 'templates/docker-service-redis.yml.j2' %}
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
     restart: always
@@ -18,8 +13,12 @@ services:
       MYSQL_USER: "{{database_username}}"
       MYSQL_PASSWORD: "{{database_password}}"
       MYSQL_HOST: {{database_host}}:3306
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if not enable_central_database %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+    depends_on:
+      - database
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% endif %}
 
   web:
     image: nginx:alpine
@@ -28,11 +27,14 @@ services:
     restart: always
     ports:
       - "127.0.0.1:{{http_port}}:80"
+    depends_on:
+      - application
     volumes:
         - "{{path_docker_volumes}}nextcloud/nginx.conf:/etc/nginx/nginx.conf:ro"
     volumes_from:
       - application
-{% include 'templates/docker-container-networks.yml.j2' %}
+
+{% include 'templates/docker-service-redis.yml.j2' %}
 
   cron:
     image: "nextcloud:{{version_nextcloud}}-fpm-alpine"
@@ -42,11 +44,9 @@ services:
     volumes:
       - data:/var/www/html
     entrypoint: /cron.sh
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+      redis:
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:
   redis:
-
-{% include 'templates/docker-compose-networks.yml.j2' %}

roles/docker-nextcloud/templates/nextcloud.conf.j2

@@ -4,7 +4,7 @@ server
 
   {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
 
-  {% if nginx_matomo_tracking | bool %}
+  {% if nginx_matomo_tracking %}
     {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
   {% endif %}
 

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

@@ -1,8 +1,18 @@
 version: "3.7"
 
-x-op-app: &app
+networks:
+  frontend:
+  backend:
+
+{% include 'templates/docker-compose-volumes.yml.j2' %}
+  data:
+
+x-op-restart-policy: &restart_policy
   restart: unless-stopped
+x-op-image: &image
   image: openproject/community:${TAG:-13}
+x-op-app: &app
+  <<: [*image, *restart_policy]
   environment:
     OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
     OPENPROJECT_HOST__NAME: "${OPENPROJECT_HOST__NAME}"
@@ -17,20 +27,24 @@ x-op-app: &app
     IMAP_ENABLED: "${IMAP_ENABLED:-false}"
   volumes:
     - "data:/var/openproject/assets"
-    # - "database:/var/openproject/pgdata"
+{% if not enable_central_database %}
+    - "database:/var/openproject/pgdata"
+{% endif %}
 
 services:
 
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+    networks:
+      - backend
 
   cache:
     image: memcached
-    restart: unless-stopped
+    <<: *restart_policy
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
+      - backend
 
   proxy:
-    restart: unless-stopped
+    <<: [*image, *restart_policy]
-    image: openproject/community:${TAG:-13}
     command: "./docker/prod/proxy"
     ports:
       - "${PORT}:80"
@@ -39,16 +53,21 @@ services:
       OPENPROJECT_RAILS__RELATIVE__URL__ROOT: "${OPENPROJECT_RAILS__RELATIVE__URL__ROOT:-}"
     depends_on:
       - web
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
+      - frontend
     volumes:
       - "data:/var/openproject/assets"
-      # - "database:/var/openproject/pgdata" Should definetly not be necessary here
+{% if not enable_central_database %}
+      - "database:/var/openproject/pgdata"
+{% endif %}
 
   web:
     <<: *app
     command: "./docker/prod/web"
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
-{% include 'templates/docker-container-depends-on-also-database.yml.j2' %}
+      - frontend
+      - backend
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       cache:
       seeder:
     labels:
@@ -72,16 +91,18 @@ services:
   worker:
     <<: *app
     command: "./docker/prod/worker"
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
-{% include 'templates/docker-container-depends-on-also-database.yml.j2' %}
+      - backend
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       cache:
       seeder:
 
   cron:
     <<: *app
     command: "./docker/prod/cron"
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
-{% include 'templates/docker-container-depends-on-also-database.yml.j2' %}
+      - backend
+{% include 'templates/docker-container-depends-on.yml.j2' %}
       cache:
       seeder:
 
@@ -89,9 +110,5 @@ services:
     <<: *app
     command: "./docker/prod/seeder"
     restart: on-failure
-{% include 'templates/docker-container-networks.yml.j2' %}
+    networks:
-
+      - backend
-{% include 'templates/docker-compose-networks.yml.j2' %}
-
-{% include 'templates/docker-compose-volumes.yml.j2' %}
-  data:

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

@@ -1,11 +1,6 @@
 version: "3.3"
 
 services:
-  
-{% include 'templates/docker-service-redis.yml.j2' %}
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     image: chocobozzz/peertube:production-bullseye
     env_file:
@@ -18,13 +13,21 @@ services:
       - data:/data
       - config:/config
     restart: "always"
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+    depends_on:
-{% include 'templates/docker-container-networks.yml.j2' %}
+      - redis
+{% if not enable_central_database %}
+      - database
+
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% endif %}
+
+{% include 'templates/docker-service-redis.yml.j2' %}
+
+    env_file:
+      - .env
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   assets:
   data:
   redis:
   config:
-
-{% include 'templates/docker-compose-networks.yml.j2' %}

roles/docker-peertube/templates/peertube.conf.j2

@@ -3,7 +3,7 @@ server {
 
   {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
 
-  {% if nginx_matomo_tracking | bool %}
+  {% if nginx_matomo_tracking %}
     {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
   {% endif %}
 

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

@@ -2,7 +2,7 @@ version: '2'
 
 services:
 
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
 
 {% include 'templates/docker-service-redis.yml.j2' %}
 
@@ -14,13 +14,13 @@ services:
     env_file:
       - ./env
     volumes:
-      - "data:/var/www/storage"
+      - "application_data:/var/www/storage"
       - "bootstrap:/var/www/bootstrap"
       - "./env:/var/www/.env"
     ports:
       - "{{http_port}}:80"
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+      redis:
   worker:
     image: zknt/pixelfed
     restart: always
@@ -29,7 +29,7 @@ services:
     env_file:
       - ./env
     volumes:
-      - "data:/var/www/storage"
+      - "application_data:/var/www/storage"
       - "bootstrap:/var/www/bootstrap"
       - "./env:/var/www/.env"
     entrypoint: /worker-entrypoint.sh
@@ -38,13 +38,11 @@ services:
       interval: 60s
       timeout: 5s
       retries: 1
-{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
+{% include 'templates/docker-container-depends-on.yml.j2' %}
+      redis:
       application:
-{% include 'templates/docker-container-networks.yml.j2' %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   redis:
-  data:
+  application_data:
   bootstrap:
-
-{% include 'templates/docker-compose-networks.yml.j2' %}

roles/docker-postgres/tasks/main.yml

@@ -34,6 +34,7 @@
     login_password: "{{ central_postgres_password }}"
     login_host: 127.0.0.1
     login_port: 5432
+  listen: create database
 
 - name: Create database user
   postgresql_user:
@@ -46,6 +47,7 @@
     login_password: "{{ central_postgres_password }}"
     login_host: 127.0.0.1
     login_port: 5432
+  listen: create database
 
 - name: Run the docker_postgres tasks once
   set_fact:

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

@@ -1,2 +1,3 @@
 docker_compose_project_name:      "roulette-wheel"
+docker_compose_instance_directory: "{{path_docker_compose_instances}}{{docker_compose_project_name}}/"
 app_path: "{{docker_compose_instance_directory}}/app/"

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

@@ -17,10 +17,12 @@ services:
       WORDPRESS_DB_NAME:      "{{database_databasename}}"
     volumes:
       - data:/var/www/html
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if not enable_central_database %}    
-{% include 'templates/docker-container-networks.yml.j2' %}
+    depends_on:
+      - database
 
-{% include 'templates/docker-compose-networks.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
+{% endif %}
 
 {% include 'templates/docker-compose-volumes.yml.j2' %}
   data:

roles/docker-yourls/meta/main.yml

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

roles/docker-yourls/tasks/main.yml

@@ -2,10 +2,6 @@
 - 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}}

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

@@ -1,9 +1,6 @@
 version: '3'
 
 services:
-
-{% include 'templates/docker-service-' + database_type + '.yml.j2' %}
-
   application:
     logging:
       driver: journald
@@ -19,8 +16,12 @@ services:
       YOURLS_SITE: "https://{{domain}}"
       YOURLS_USER: "{{yourls_user}}"
       YOURLS_PASS: "{{yourls_user_password}}"
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% if not enable_central_database %}
-{% include 'templates/docker-container-networks.yml.j2' %}
+    depends_on:
+      - database
 
-{% include 'templates/docker-compose-volumes-just-database.yml.j2' %}
+{% include 'templates/docker-service-{{ database_type }}.yml.j2' %}
-{% include 'templates/docker-compose-networks.yml.j2' %}
+
+volumes:
+  database:
+{% endif %}

roles/heal-docker/tasks/main.yml

@@ -23,7 +23,7 @@
     src: heal-docker.timer.j2
     dest: "/etc/systemd/system/heal-docker.timer"
   register: heal_docker_timer
-  changed_when: heal_docker_timer.changed or activate_all_timers | bool
+  changed_when: heal_docker_timer.changed or activate_all_timers
   notify: restart heal-docker.timer
   when: run_once_heal_docker is not defined
 

roles/health-btrfs/tasks/main.yml

@@ -20,5 +20,5 @@
     src: health-btrfs.timer.j2
     dest: "/etc/systemd/system/health-btrfs.timer"
   register: health_btrs_timer
-  changed_when: health_btrs_timer.changed or activate_all_timers | bool
+  changed_when: health_btrs_timer.changed or activate_all_timers
   notify: restart health-btrfs.timer

roles/health-disc-space/tasks/main.yml

@@ -20,5 +20,5 @@
     src: health-disc-space.timer.j2
     dest: /etc/systemd/system/health-disc-space.timer
   register: health_disc_space_timer
-  changed_when: health_disc_space_timer.changed or activate_all_timers | bool
+  changed_when: health_disc_space_timer.changed or activate_all_timers
   notify: restart health-disc-space.timer

roles/health-docker-container/tasks/main.yml

@@ -21,7 +21,7 @@
     src: health-docker-container.timer.j2
     dest: "/etc/systemd/system/health-docker-container.timer"
   register: health_docker_container_timer
-  changed_when: health_docker_container_timer.changed or activate_all_timers | bool
+  changed_when: health_docker_container_timer.changed or activate_all_timers
   notify: restart health-docker-container.timer
   when: run_once_health_docker_container is not defined
 

roles/health-docker-volumes/tasks/main.yml

@@ -21,7 +21,7 @@
     src: health-docker-volumes.timer.j2
     dest: "/etc/systemd/system/health-docker-volumes.timer"
   register: health_docker_volumes_timer
-  changed_when: health_docker_volumes_timer.changed or activate_all_timers | bool
+  changed_when: health_docker_volumes_timer.changed or activate_all_timers
   notify: restart health-docker-volumes.timer
   when: run_once_health_docker_volumes is not defined
 

roles/health-journalctl/tasks/main.yml

@@ -20,5 +20,5 @@
     src: health-journalctl.timer.j2
     dest: /etc/systemd/system/health-journalctl.timer
   register: health_journalctl_timer
-  changed_when: health_journalctl_timer.changed or activate_all_timers | bool
+  changed_when: health_journalctl_timer.changed or activate_all_timers
   notify: restart health-journalctl.timer

roles/health-nginx/tasks/main.yml

@@ -29,7 +29,7 @@
     src: health-nginx.timer.j2
     dest: "/etc/systemd/system/health-nginx.timer"
   register: health_nginx_timer
-  changed_when: health_nginx_timer.changed or activate_all_timers | bool
+  changed_when: health_nginx_timer.changed or activate_all_timers
   notify: restart health-nginx.timer
   when: run_once_health_nginx is not defined
 

roles/health-nginx/templates/health-nginx.py.j2

@@ -31,7 +31,7 @@ for filename in os.listdir(config_path):
         # Determine expected status codes based on the domain
         if domain == '{{domain_listmonk}}':
             expected_statuses = [401]
-{% if nginx_matomo_tracking | bool %}
+{% if nginx_matomo_tracking %}
         elif parts[0] == 'www' or domain in redirected_domains:
             expected_statuses = [301]
 {% endif %}

roles/nginx-certbot/tasks/main.yml

@@ -16,7 +16,7 @@
     src:  certbot.timer.j2
     dest: /etc/systemd/system/certbot.timer
   register: certbot_timer
-  changed_when: certbot_timer.changed or activate_all_timers | bool
+  changed_when: certbot_timer.changed or activate_all_timers
   notify: restart certbot timer
   when: run_once_nginx_certbot is not defined
 

roles/nginx-docker-reverse-proxy/templates/domain.conf.j2

@@ -3,7 +3,7 @@ server
   server_name {{domain}};
 
   # Include Matomo Tracking Code
-  {% if nginx_matomo_tracking | bool %}
+  {% if nginx_matomo_tracking %}
     {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
   {% endif %}
 

roles/nginx-homepage/templates/homepage.nginx.conf.j2

@@ -5,7 +5,7 @@ server
   
   {% include 'roles/letsencrypt/templates/ssl_header.j2' %}
 
-  {% if nginx_matomo_tracking | bool %}
+  {% if nginx_matomo_tracking %}
     {% include 'roles/nginx-matomo-tracking/templates/matomo-tracking.conf.j2' %}
   {% endif %}
 

roles/nginx/tasks/main.yml

@@ -4,13 +4,6 @@
   notify: restart nginx
   when: run_once_nginx is not defined
 
-- name: install nginx-mod-headers-more for matomo
-  pacman: 
-    name: nginx-mod-headers-more
-    state: present
-  notify: restart nginx
-  when: run_once_nginx is not defined and nginx_matomo_tracking | bool
-
 - name: Ensure nginx configuration directories are present
   file:
     path: "{{ item }}"

roles/nginx/templates/nginx.conf.j2

@@ -1,7 +1,4 @@
-{% if nginx_matomo_tracking | bool %}
 load_module /usr/lib/nginx/modules/ngx_http_headers_more_filter_module.so;
-{% endif %}
-
 worker_processes auto;
 
 events

roles/update-docker/tasks/main.yml

@@ -2,7 +2,7 @@
   systemd:
     name: backup-docker-to-local-everything.service
     state: started
-  when: force_backup_before_update | bool
+  when: force_backup_before_update
 
 - name: create {{update_docker_script}}
   copy:

tasks/implement-matomo-tracking.yml

@@ -1,4 +1,4 @@
 - name: Activate NGINX matomo tracking
   include_role:
     name: nginx-matomo-tracking
-  when: nginx_matomo_tracking | bool and domain is defined
+  when: nginx_matomo_tracking and domain is defined

templates/docker-compose-networks.yml.j2

@@ -1,6 +1,5 @@
-# This template needs to be included in docker-compose.yml
 networks:
-{% if enable_central_database | bool %}
+{% if enable_central_database %}
   central_{{ database_type }}_network:
     external: true
 {% endif %}

templates/docker-compose-volumes-just-database.yml.j2

@@ -1,5 +0,0 @@
-# This needs to be included in docker-compose.yml which just contain a database volume
-{% if not enable_central_database | bool %}
-volumes:
-  database:
-{% endif %}

templates/docker-compose-volumes.yml.j2

@@ -1,5 +1,4 @@
-# This template needs to be included in docker-compose.yml which contain a database and additional volumes
 volumes:
-{% if not enable_central_database | bool %}
+{% if not enable_central_database %}
   database:
 {% endif %}

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

@@ -1,6 +0,0 @@
-# This template needs to be included in docker-compose.yml containers which depend on a database and additional containers
-    depends_on:
-{% if not enable_central_database | bool %}
-      database:
-        condition: service_healthy
-{% endif %}

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

@@ -1,8 +0,0 @@
-# This template needs to be included in docker-compose.yml contaienrs, which depend on a database, redis and optional additional volumes
-    depends_on:
-{% if not enable_central_database | bool %}
-      database:
-        condition: service_healthy
-{% endif %}
-      redis:
-        condition: service_healthy

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

@@ -1,6 +0,0 @@
-# This template needs to be included in docker-compose.yml contaienrs, which just depend on a database
-{% if not enable_central_database | bool %}
-    depends_on:
-      database:
-        condition: service_healthy
-{% endif %}

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

@@ -0,0 +1,5 @@
+{% if enable_central_database %}
+    depends_on:
+      database:
+		    condition: service_healthy
+{% endif %}

templates/docker-container-networks.yml.j2

@@ -1,6 +1,5 @@
-# This template needs to be included in docker-compose.yml containers
     networks:
       - {{docker_compose_project_name}}_network  
-{% if enable_central_database | bool %}
+{% if enable_central_database %}
       - central_{{ database_type }}_network
 {% endif %}

templates/docker-service-mariadb.yml.j2

@@ -1,5 +1,4 @@
-# This template needs to be included in docker-compose.yml, which depend on a mariadb database
+{% if not enable_central_database %}
-{% if not enable_central_database | bool %}
   database:
     logging:
       driver: journald

templates/docker-service-postgres.yml.j2

@@ -1,5 +1,4 @@
-# This template needs to be included in docker-compose.yml, which depend on a postgres database
+{% if not enable_central_database %}  
-{% if not enable_central_database | bool %}  
   database:
     image: postgres:{{database_version}}-alpine
     environment:

templates/docker-service-redis.yml.j2

@@ -1,4 +1,3 @@
-# This template needs to be included in docker-compose.yml, which depend on redis
   redis:
     image: redis:alpine
     restart: always

vars/docker-database-service.yml.j2

@@ -1,6 +1,4 @@
-docker_compose_instance_directory:  "{{ path_docker_compose_instances + docker_compose_project_name + '/' }}"
+docker_compose_instance_directory:  "{{ docker_compose_instance_directory | default(path_docker_compose_instances + docker_compose_project_name + '/') }}"
-database_host:                      "{{ 'central-' + database_type if enable_central_database else 'database' }}"
+database_host:                      "{{ database_host | default('database') }}"
-database_databasename:              "{{ docker_compose_project_name }}"
+database_databasename:              "{{ database_databasename | default(docker_compose_project_name) }}"
-database_username:                  "{{ docker_compose_project_name }}"
+database_username:                  "{{ database_username | default(docker_compose_project_name) }}"
-
-# This will lead to problems with bbb and openproject