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

@@ -1,6 +1,6 @@
-- name: set service_name to cleanup-backups
+- name: set service_name to the name of the current role
   set_fact:
-    service_name: "cleanup-backups"
+    service_name: "{{ role_name }}"
   when: run_once_cleanup_backups_timer is not defined
 
 - name: "include role for systemd-timer for {{service_name}}"

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

@@ -1,3 +1,5 @@
+version: '3.7'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -1,3 +1,4 @@
+version: '3.2'
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '2'
+
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

roles/docker-bigbluebutton/README.md

@@ -28,4 +28,3 @@ watch -n 2 "docker compose ps -a"
 - https://www.cyberciti.biz/faq/linux-command-to-remove-virtual-interfaces-or-network-aliases/
 - https://www.cyberciti.biz/faq/linux-restart-network-interface/
 - https://stackoverflow.com/questions/53347951/docker-network-not-found
-- https://github.com/bigbluebutton/docker/issues/325

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

@@ -1,3 +1,5 @@
+version: '3.8'
+
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3.2'
+
 services:
   elasticsearch:
     build:

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

@@ -1,3 +1,5 @@
+version: "3"
+
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -1,3 +1,4 @@
+version: '3.6'
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

roles/docker-ldap-sso/templates/docker-compose.yml.j2

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
   openldap:
     image: osixia/openldap:1.2.4

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

@@ -1,3 +1,5 @@
+version: "3.7"
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '2.2'
+
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,4 @@
+version: '3'
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3.1'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -5,9 +5,6 @@ services:
     image: docker.io/bitnami/moodle:latest
     ports:
       - 127.0.0.1:{{http_port}}:8080
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
     environment:
       - MOODLE_DATABASE_HOST={{database_host}}
       - MOODLE_DATABASE_PORT_NUMBER=3306
@@ -25,12 +22,6 @@ services:
     volumes:
       - 'moodle:/bitnami/moodle'
       - 'data:/bitnami/moodledata'
-# Healthcheck is not possible due to missing curl and wget in container
-#    healthcheck:
-#      test: ["CMD", "curl", "-f", "http://127.0.0.1:8080"]
-#      interval: 1m
-#      timeout: 10s
-#      retries: 3
 {% include 'templates/docker/container/depends-on-just-database.yml.j2' %}
 {% include 'templates/docker/container/networks.yml.j2' %}
 

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

@@ -1,3 +1,4 @@
+version: '3.8'
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
 
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,6 +1,7 @@
+version: "3.7"
+  
 x-op-app: &app
-  logging:
-    driver: journald
+  restart: {{docker_restart_policy}}
   image: custom_openproject
   environment:
     OPENPROJECT_HTTPS: "${OPENPROJECT_HTTPS}"
@@ -26,14 +27,10 @@ services:
     image: memcached
     container_name: openproject-memcached
     restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
 {% include 'templates/docker/container/networks.yml.j2' %}
 
   proxy:
     restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
     image: custom_openproject
     container_name: openproject-proxy
     command: "./docker/prod/proxy"
@@ -51,7 +48,6 @@ services:
 
   web:
     <<: *app
-    restart: {{docker_restart_policy}}
     command: "./docker/prod/web"
     container_name: openproject-web
 {% include 'templates/docker/container/networks.yml.j2' %}
@@ -72,9 +68,6 @@ services:
   autoheal:
     image: willfarrell/autoheal:1.2.0
     container_name: openproject-autoheal
-    restart: {{docker_restart_policy}}
-    logging:
-      driver: journald
     volumes:
       - "/var/run/docker.sock:/var/run/docker.sock"
     environment:
@@ -84,7 +77,6 @@ services:
 
   worker:
     <<: *app
-    restart: {{docker_restart_policy}}
     command: "./docker/prod/worker"
     container_name: openproject-worker
 {% include 'templates/docker/container/networks.yml.j2' %}
@@ -96,7 +88,6 @@ services:
 
   cron:
     <<: *app
-    restart: {{docker_restart_policy}}
     command: "./docker/prod/cron"
     container_name: openproject-cron
 {% include 'templates/docker/container/networks.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: "3.3"
+
 services:
   
 {% include 'templates/docker/services/redis.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '2'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

roles/docker-roulette-wheel/templates/docker-compose.yml.j2

@@ -1,3 +1,4 @@
+version: '3.7'
 services:
     application:
         container_name: roulette_application

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

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

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

@@ -1,3 +1,5 @@
+version: '3'
+
 services:
 
 {% include 'templates/docker/services/' + database_type + '.yml.j2' %}

roles/systemd-timer/handlers/main.yml

@@ -0,0 +1,6 @@
+- name: "restart timer"
+  systemd:
+    name: "{{service_name}}.cymais.timer"
+    state: restarted
+    enabled: yes
+    daemon_reload: yes

roles/systemd-timer/tasks/main.yml

@@ -3,11 +3,5 @@
     src: dummy.timer.j2
     dest: "/etc/systemd/system/{{service_name}}.cymais.timer"
   register: dummy_timer
-
-- name: "restart timer"
-  systemd:
-    daemon_reload: yes
-    name: "{{service_name}}.cymais.timer"
-    state: restarted
-    enabled: yes
-  when: dummy_timer.changed or activate_all_timers | bool
+  changed_when: dummy_timer.changed or activate_all_timers | bool
+  notify: restart timer