Optimized names

group_vars/all

@@ -1,6 +1,7 @@
 # General
 verbose:              false       # Prints well formated debug information
-top_domain:           "localhost"
+top_domain:           "localhost" # Change this in inventory to your domain
+ip4_address:          "127.0.0.1" # Change thie in inventory to the ip address of your server
 backups_folder_path:  "/Backups/"
 
 # Server Tact Variables 
@@ -128,6 +129,7 @@ domain_roulette:                "roulette.{{top_domain}}"
 domain_attendize:               "tickets.{{top_domain}}"
 domain_yourls:                  "s.{{top_domain}}"
 domain_openproject:             "project.{{top_domain}}"
+domains_wordpress:              ["wordpress.{{top_domain}}","blog.{{top_domain}}"]
 
 ### Common Configurations
 postgres_default_version:       "16"

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

@@ -1,16 +1,4 @@
 - name: "reload backup-docker-to-local.service"
   systemd:
     name: backup-docker-to-local.service
-    daemon_reload: yes
+    daemon_reload: yes
-
-- name: "reload backup-docker-to-local-everything.service"
-  systemd:
-    name: backup-docker-to-local-everything.service
-    daemon_reload: yes
-
-- name: "restart backup-docker-to-local.timer"
-  systemd:
-    name: backup-docker-to-local.timer
-    state: started
-    enabled: yes
-    daemon_reload: yes

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

@@ -34,11 +34,16 @@
   notify: reload backup-docker-to-local.service
   when: run_once_backup_docker_to_local is not defined
 
-- name: configure backup-docker-to-local.timer.tpl
+- name: set service_name to the name of the current role
-  template: src=backup-docker-to-local.timer.j2 dest=/etc/systemd/system/backup-docker-to-local.timer
+  set_fact:
-  register: backup_docker_to_local_timer
+    service_name: "{{ role_name }}"
-  changed_when: backup_docker_to_local_timer.changed or activate_all_timers | bool
+  when: run_once_backup_docker_to_local is not defined
-  notify: restart backup-docker-to-local.timer
+
+- name: "include role for systemd-timer for {{service_name}}"
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_backup_docker_to_local}}"
   when: run_once_backup_docker_to_local is not defined
 
 - name: seed database values

roles/backup-docker-to-local/templates/backup-docker-to-local.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=backups the docker volumes
-
-[Timer]
-OnCalendar={{on_calendar_backup_docker_to_local}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

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

@@ -14,15 +14,19 @@
   template: src=backup-remote-to-local.service.j2 dest=/etc/systemd/system/backup-remote-to-local.service
   notify: reload backup-remote-to-local service
 
-- 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
-  notify: restart backup-remote-to-local timer
-
 - name: create backups-remote-to-local.sh
   template: 
     src: backups-remote-to-local.sh.j2 
     dest: "{{docker_backup_remote_to_local_folder}}backups-remote-to-local.sh"
     mode: 0755
 
+- name: set service_name to the name of the current role
+  set_fact:
+    service_name: "{{ role_name }}"
+
+- name: "include role for systemd-timer for {{service_name}}"
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_backup_remote_to_local}}"
+

roles/backup-remote-to-local/templates/backup-remote-to-local.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts pull remote backup timer
-
-[Timer]
-OnCalendar={{on_calendar_backup_remote_to_local}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

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

@@ -1,12 +0,0 @@
-- name: "restart cleanup-backups.timer"
-  systemd:
-    name: cleanup-backups.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes
-  when: run_once_cleanup_backup_timer is not defined
-
-- name: run the cleanup_backup_timer tasks once
-  set_fact:
-    run_once_cleanup_backup_timer: true
-  when: run_once_cleanup_backup_timer is not defined

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

@@ -1,10 +1,13 @@
-- name: create cleanup-backups.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src:  "cleanup-backups.timer.j2"
+    service_name: "{{ role_name }}"
-    dest: "/etc/systemd/system/cleanup-backups.timer"
+  when: run_once_cleanup_backups_timer is not defined
-  register: cleanup_backups_timer
+
-  changed_when: cleanup_backups_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart cleanup-backups.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_cleanup_backups}}"
   when: run_once_cleanup_backups_timer is not defined
 
 - name: run the cleanup_backups_timer tasks once

roles/cleanup-backups-timer/templates/cleanup-backups.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts cleanup-backups.service
-
-[Timer]
-OnCalendar={{on_calendar_cleanup_backups}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=true
-
-[Install]
-WantedBy=timers.target

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

@@ -3,9 +3,3 @@
     name: cleanup-disc-space.service
     enabled: yes
     daemon_reload: yes
-- name: "restart cleanup-disc-space.timer"
-  systemd:
-    name: cleanup-disc-space.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

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

@@ -15,10 +15,12 @@
     dest: /etc/systemd/system/cleanup-disc-space.service
   notify: reload cleanup-disc-space.service
 
-- name: create cleanup-disc-space.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: cleanup-disc-space.timer.j2
+    service_name: "{{ role_name }}"
-    dest: /etc/systemd/system/cleanup-disc-space.timer
+
-  register: cleanup_disc_space_timer
+- name: "include role for systemd-timer for {{service_name}}"
-  changed_when: cleanup_disc_space_timer.changed or activate_all_timers | bool
+  include_role:
-  notify: restart cleanup-disc-space.timer
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_cleanup_disc_space}}"

roles/cleanup-disc-space/templates/cleanup-disc-space.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts cleanup-disc-space.service
-
-[Timer]
-OnCalendar={{on_calendar_cleanup_disc_space}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=true
-
-[Install]
-WantedBy=timers.target

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

@@ -2,11 +2,4 @@
   systemd:
     name: cleanup-failed-docker-backups.service
     enabled: yes
-    daemon_reload: yes
-
-- name: "restart cleanup-failed-docker-backups.timer"
-  systemd:
-    name: cleanup-failed-docker-backups.timer
-    state: restarted
-    enabled: yes
     daemon_reload: yes

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

@@ -19,13 +19,16 @@
   notify: reload cleanup-failed-docker-backups.service daemon
   when: run_once_cleanup_failed_docker_backups is not defined
 
-- name: create cleanup-failed-docker-backups.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: cleanup-failed-docker-backups.timer.j2
+    service_name: "{{ role_name }}"
-    dest: /etc/systemd/system/cleanup-failed-docker-backups.timer
+  when: run_once_cleanup_failed_docker_backups is not defined
-  register: cleanup_failed_docker_backups_timer
+
-  changed_when: cleanup_failed_docker_backups_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart cleanup-failed-docker-backups.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_cleanup_failed_docker}}"
   when: run_once_cleanup_failed_docker_backups is not defined
 
 - name: run the cleanup_failed_docker_backups tasks once

roles/cleanup-failed-docker-backups/templates/cleanup-failed-docker-backups.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts cleanup-failed-docker-backups.service
-
-[Timer]
-OnCalendar={{on_calendar_cleanup_failed_docker}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=true
-
-[Install]
-WantedBy=timers.target

roles/docker-mailu/handlers/main.yml

@@ -4,10 +4,4 @@
     name: deploy-letsencrypt-mailu.service
     state: restarted
     enabled: yes
-    daemon_reload: yes
+    daemon_reload: yes
-- name: "restart deploy-letsencrypt-mailu.timer"
-  systemd:
-    name: deploy-letsencrypt-mailu.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

roles/docker-mailu/tasks/main.yml

@@ -54,10 +54,10 @@
     dest: "/etc/systemd/system/deploy-letsencrypt-mailu.service"
   notify: restart deploy-letsencrypt-mailu.service
 
-- name: configure deploy-letsencrypt-mailu.timer
+- name: "include role for systemd-timer for {{service_name}}"
-  template: 
+  include_role:
-    src:  "deploy-letsencrypt-mailu.timer.j2" 
+    name: systemd-timer
-    dest: "/etc/systemd/system/deploy-letsencrypt-mailu.timer"
+  vars:
-  register: deploy_letsencrypt_mailu_timer
+    on_calendar:  "{{on_calendar_deploy_mailu_certificates}}"
-  changed_when: deploy_letsencrypt_mailu_timer.changed or activate_all_timers | bool
+    service_name: "deploy-letsencrypt-mailu"
-  notify: restart deploy-letsencrypt-mailu.timer
+    persistent:   "true"

roles/docker-mailu/templates/deploy-letsencrypt-mailu.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=Deployment of Let's Encrypt's certificates
-
-[Timer]
-OnCalendar={{on_calendar_deploy_mailu_certificates}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=true
-
-[Install]
-WantedBy=timers.target

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

@@ -54,7 +54,9 @@ services:
       - "dkim:/dkim"
 {% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
       resolver:
+        condition: service_started
       front:
+        condition: service_started
     logging:
       driver: journald
     dns:
@@ -149,13 +151,12 @@ services:
       - "webdav_data:/data"
     logging:
       driver: journald
-    networks:
-      - radicale
     depends_on:
       - resolver
     dns:
       - 192.168.203.254
 {% include 'templates/docker-container-networks.yml.j2' %}
+      radicale:
 
   fetchmail:
     image: ghcr.io/mailu/fetchmail:{{version_mailu}}

roles/docker-mailu/vars/main.yml

@@ -1,2 +1,3 @@
 docker_compose_project_name:        "mailu"
-database_password:  	              "{{mailu_database_password}}"
+database_password:  	              "{{mailu_database_password}}"
+database_type:                      "mariadb"

roles/docker-mariadb/tasks/main.yml

@@ -40,7 +40,7 @@
     timeout: 300
   when: run_once_docker_mariadb is not defined
 
-- name: create database
+- name: "Create database: {{ database_databasename }}"
   mysql_db:
     name: "{{ database_databasename }}"
     state: present
@@ -49,8 +49,7 @@
     login_host: 127.0.0.1
     login_port: 3306
 
-
+- name: "Create database user: {{ database_username }}"
-- name: create database user
   mysql_user:
     name: "{{database_username}}"
     password: "{{database_password}}"

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

@@ -18,7 +18,7 @@ services:
       MYSQL_USER: "{{database_username}}"
       MYSQL_PASSWORD: "{{database_password}}"
       MYSQL_HOST: {{database_host}}:3306
-{% include 'templates/docker-container-depends-on-just-database.yml.j2' %}
+{% include 'templates/docker-container-depends-on-database-redis.yml.j2' %}
 {% include 'templates/docker-container-networks.yml.j2' %}
 
   web:

roles/heal-docker/handlers/main.yml

@@ -2,9 +2,3 @@
   systemd:
     name: heal-docker.service
     daemon_reload: yes
-- name: "restart heal-docker.timer"
-  systemd:
-    name: heal-docker.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

roles/heal-docker/tasks/main.yml

@@ -18,13 +18,16 @@
   notify: reload heal-docker.service
   when: run_once_heal_docker is not defined
 
-- name: create heal-docker.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: heal-docker.timer.j2
+    service_name: "{{ role_name }}"
-    dest: "/etc/systemd/system/heal-docker.timer"
+  when: run_once_heal_docker is not defined
-  register: heal_docker_timer
+
-  changed_when: heal_docker_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart heal-docker.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_heal_docker}}"
   when: run_once_heal_docker is not defined
 
 - name: run the heal_docker tasks once

roles/heal-docker/templates/heal-docker.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts heal-docker.service
-
-[Timer]
-OnCalendar={{on_calendar_heal_docker}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

roles/health-btrfs/handlers/main.yml

@@ -2,10 +2,4 @@
   systemd:
     name: health-btrfs.service
     enabled: yes
-    daemon_reload: yes
+    daemon_reload: yes
-- name: "restart health-btrfs.timer"
-  systemd:
-    name: health-btrfs.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

roles/health-btrfs/tasks/main.yml

@@ -15,10 +15,12 @@
     dest: /etc/systemd/system/health-btrfs.service
   notify: reload health-btrfs.service
 
-- name: create health-btrfs.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: health-btrfs.timer.j2
+    service_name: "{{ role_name }}"
-    dest: "/etc/systemd/system/health-btrfs.timer"
+
-  register: health_btrs_timer
+- name: "include role for systemd-timer for {{service_name}}"
-  changed_when: health_btrs_timer.changed or activate_all_timers | bool
+  include_role:
-  notify: restart health-btrfs.timer
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_health_btrfs}}"

roles/health-btrfs/templates/health-btrfs.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts health-btrfs.service
-
-[Timer]
-OnCalendar={{on_calendar_health_btrfs}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

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

@@ -3,9 +3,3 @@
     name: health-disc-space.service
     enabled: yes
     daemon_reload: yes
-- name: "restart health-disc-space.timer"
-  systemd:
-    name: health-disc-space.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

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

@@ -15,10 +15,12 @@
     dest: /etc/systemd/system/health-disc-space.service
   notify: reload health-disc-space.service
 
-- name: create health-disc-space.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: health-disc-space.timer.j2
+    service_name: "{{ role_name }}"
-    dest: /etc/systemd/system/health-disc-space.timer
+
-  register: health_disc_space_timer
+- name: "include role for systemd-timer for {{service_name}}"
-  changed_when: health_disc_space_timer.changed or activate_all_timers | bool
+  include_role:
-  notify: restart health-disc-space.timer
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_health_disc_space}}"

roles/health-disc-space/templates/health-disc-space.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts health-disc-space.service
-
-[Timer]
-OnCalendar={{on_calendar_health_disc_space}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=true
-
-[Install]
-WantedBy=timers.target

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

@@ -3,9 +3,3 @@
     name: health-docker-container.service
     enabled: yes
     daemon_reload: yes
-- name: "restart health-docker-container.timer"
-  systemd:
-    name: health-docker-container.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

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

@@ -16,13 +16,16 @@
   notify: reload health-docker-container.service
   when: run_once_health_docker_container is not defined
 
-- name: create health-docker-container.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: health-docker-container.timer.j2
+    service_name: "{{ role_name }}"
-    dest: "/etc/systemd/system/health-docker-container.timer"
+  when: run_once_health_docker_container is not defined
-  register: health_docker_container_timer
+
-  changed_when: health_docker_container_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart health-docker-container.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_health_docker_container}}"
   when: run_once_health_docker_container is not defined
 
 - name: run the health_docker_container tasks once

roles/health-docker-container/templates/health-docker-container.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts health-docker-container.service
-
-[Timer]
-OnCalendar={{on_calendar_health_docker_container}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

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

@@ -3,9 +3,3 @@
     name: health-docker-volumes.service
     enabled: yes
     daemon_reload: yes
-- name: "restart health-docker-volumes.timer"
-  systemd:
-    name: health-docker-volumes.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

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

@@ -16,13 +16,16 @@
   notify: reload health-docker-volumes.service
   when: run_once_health_docker_volumes is not defined
 
-- name: create health-docker-volumes.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: health-docker-volumes.timer.j2
+    service_name: "{{ role_name }}"
-    dest: "/etc/systemd/system/health-docker-volumes.timer"
+  when: run_once_health_docker_volumes is not defined
-  register: health_docker_volumes_timer
+
-  changed_when: health_docker_volumes_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart health-docker-volumes.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_health_docker_volumes}}"
   when: run_once_health_docker_volumes is not defined
 
 - name: run the health_docker_volumes tasks once

roles/health-docker-volumes/templates/health-docker-volumes.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts health-docker-volumes.service
-
-[Timer]
-OnCalendar={{on_calendar_health_docker_volumes}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

roles/health-journalctl/handlers/main.yml

@@ -3,9 +3,3 @@
     name: health-journalctl.service
     enabled: yes
     daemon_reload: yes
-- name: "restart health-journalctl.timer"
-  systemd:
-    name: health-journalctl.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

roles/health-journalctl/tasks/main.yml

@@ -3,22 +3,34 @@
     path: "{{health_journalctl_folder}}"
     state: directory
     mode: 0755
+  when: run_once_health_journalctl is not defined
 
 - name: create health-journalctl.sh
   copy:
     src: health-journalctl.sh
     dest: "{{health_journalctl_folder}}health-journalctl.sh"
+  when: run_once_health_journalctl is not defined
 
 - name: create health-journalctl.service
   template: 
     src: health-journalctl.service.j2
     dest: /etc/systemd/system/health-journalctl.service
   notify: reload health-journalctl.service
+  when: run_once_health_journalctl is not defined
 
-- name: create health-journalctl.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: health-journalctl.timer.j2
+    service_name: "{{ role_name }}"
-    dest: /etc/systemd/system/health-journalctl.timer
+  when: run_once_health_journalctl is not defined
-  register: health_journalctl_timer
+
-  changed_when: health_journalctl_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart health-journalctl.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_health_journalctl}}"
+  when: run_once_health_journalctl is not defined
+
+- name: run the health_journalctl tasks once
+  set_fact:
+    run_once_health_journalctl: true
+  when: run_once_health_journalctl is not defined

roles/health-journalctl/templates/health-journalctl.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts health-journalctl.service
-
-[Timer]
-OnCalendar={{on_calendar_health_journalctl}}
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

roles/health-nginx/handlers/main.yml

@@ -3,10 +3,3 @@
     name: health-nginx.service
     enabled: yes
     daemon_reload: yes
-
-- name: "restart health-nginx.timer"
-  systemd:
-    name: health-nginx.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

roles/health-nginx/tasks/main.yml

@@ -24,13 +24,16 @@
   notify: reload health-nginx.service
   when: run_once_health_nginx is not defined
 
-- name: create health-nginx.timer
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src: health-nginx.timer.j2
+    service_name: "{{ role_name }}"
-    dest: "/etc/systemd/system/health-nginx.timer"
+  when: run_once_health_nginx is not defined
-  register: health_nginx_timer
+
-  changed_when: health_nginx_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart health-nginx.timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_health_nginx}}"
   when: run_once_health_nginx is not defined
 
 - name: run the health_nginx tasks once

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

@@ -1,10 +0,0 @@
-[Unit]
-Description=starts health-nginx.service
-
-[Timer]
-OnCalendar={{ on_calendar_health_nginx }}
-RandomizedDelaySec={{ randomized_delay_sec }}
-Persistent=false
-
-[Install]
-WantedBy=timers.target

roles/nginx-certbot/handlers/main.yml

@@ -1,12 +1,6 @@
 - name: "reload certbot service"
   systemd:
-    name: certbot.service
+    name: nginx-certbot.service
     state: reloaded
     enabled: yes
     daemon_reload: yes
-- name: "restart certbot timer"
-  systemd:
-    name: certbot.timer
-    state: restarted
-    enabled: yes
-    daemon_reload: yes

roles/nginx-certbot/tasks/main.yml

@@ -4,20 +4,24 @@
     state: present
   when: run_once_nginx_certbot is not defined
 
-- name: configure certbot.service.tpl
+- name: configure nginx-certbot.service
   template: 
-    src:  certbot.service.j2
+    src:  nginx-certbot.service.j2
-    dest: /etc/systemd/system/certbot.service
+    dest: /etc/systemd/system/nginx-certbot.service
   notify: reload certbot service
   when: run_once_nginx_certbot is not defined
 
-- name: configure certbot.timer.tpl
+- name: set service_name to the name of the current role
-  template:
+  set_fact:
-    src:  certbot.timer.j2
+    service_name: "{{ role_name }}"
-    dest: /etc/systemd/system/certbot.timer
+  when: run_once_nginx_certbot is not defined
-  register: certbot_timer
+
-  changed_when: certbot_timer.changed or activate_all_timers | bool
+- name: "include role for systemd-timer for {{service_name}}"
-  notify: restart certbot timer
+  include_role:
+    name: systemd-timer
+  vars:
+    on_calendar:  "{{on_calendar_renew_lets_encrypt_certificates}}"
+    persistent:   "true"
   when: run_once_nginx_certbot is not defined
 
 - name: run the nginx_certbot tasks once

roles/nginx-certbot/templates/certbot.timer.j2

@@ -1,10 +0,0 @@
-[Unit]
-Description=Renewal of Let's Encrypt's certificates
-
-[Timer]
-OnCalendar=0/12:00:00
-RandomizedDelaySec={{randomized_delay_sec}}
-Persistent=true
-
-[Install]
-WantedBy=timers.target

roles/systemd-timer/handlers/main.yml

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

roles/systemd-timer/tasks/main.yml

@@ -0,0 +1,7 @@
+- name: create {{service_name}}.timer
+  template:
+    src: dummy.timer.j2
+    dest: "/etc/systemd/system/{{service_name}}.timer"
+  register: dummy_timer
+  changed_when: dummy_timer.changed or activate_all_timers | bool
+  notify: restart timer

roles/systemd-timer/templates/dummy.timer.j2

@@ -0,0 +1,10 @@
+[Unit]
+Description=Timer to start {{service_name}}.service
+
+[Timer]
+OnCalendar={{on_calendar}}
+RandomizedDelaySec={{randomized_delay_sec}}
+Persistent={{ persistent | default('false') }}
+
+[Install]
+WantedBy=timers.target

servers.yml

@@ -39,7 +39,7 @@
   roles:
   - role: docker-wordpress
     vars:
-      domains: "{{wordpress_domains}}"
+      domains: "{{domains_wordpress}}"
       http_port: 8003
 
 - name: setup mediawiki hosts

templates/docker-compose-networks.yml.j2

@@ -4,4 +4,5 @@ networks:
   central_{{ database_type }}_network:
     external: true
 {% endif %}
-  {{docker_compose_project_name}}_network:
+  {{docker_compose_project_name}}_network:
+{{ "\n" }}

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

@@ -2,4 +2,5 @@
 {% if not enable_central_database | bool %}
 volumes:
   database:
-{% endif %}
+{% endif %}
+{{ "\n" }}

templates/docker-compose-volumes.yml.j2

@@ -2,4 +2,5 @@
 volumes:
 {% if not enable_central_database | bool %}
   database:
-{% endif %}
+{% endif %}
+{{ "\n" }}

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

@@ -3,4 +3,5 @@
 {% if not enable_central_database | bool %}
       database:
         condition: service_healthy
-{% endif %}
+{% endif %}
+{{ "\n" }}

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

@@ -6,3 +6,4 @@
 {% endif %}
       redis:
         condition: service_healthy
+{{ "\n" }}

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

@@ -3,4 +3,5 @@
     depends_on:
       database:
         condition: service_healthy
-{% endif %}
+{% endif %}
+{{ "\n" }}

templates/docker-container-networks.yml.j2

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

templates/docker-service-mariadb.yml.j2

@@ -21,4 +21,5 @@
       retries: 5
     networks:
       - {{docker_compose_project_name}}_network
-{% endif %}
+{% endif %}
+{{ "\n" }}

templates/docker-service-postgres.yml.j2

@@ -19,4 +19,5 @@
         target: /var/lib/postgresql/data
     networks:
       - {{docker_compose_project_name}}_network
-{% endif %}
+{% endif %}
+{{ "\n" }}

templates/docker-service-redis.yml.j2

@@ -12,4 +12,5 @@
       timeout: 3s
       retries: 30
     networks:
-      - {{docker_compose_project_name}}_network
+      - {{docker_compose_project_name}}_network
+{{ "\n" }}