From d8aa02e25c4929ebf9673678ea4ff57fa98a7da3 Mon Sep 17 00:00:00 2001 From: Michael Grote Date: Wed, 5 Jun 2024 18:51:11 +0200 Subject: [PATCH] f --- roles/mgrote_docker_housekeeping/defaults/main.yml | 3 +++ roles/mgrote_docker_housekeeping/handlers/main.yml | 7 +------ roles/mgrote_docker_housekeeping/tasks/main.yml | 4 ++-- .../templates/docker_housekeeping.service.j2 | 12 ++---------- 4 files changed, 8 insertions(+), 18 deletions(-) create mode 100644 roles/mgrote_docker_housekeeping/defaults/main.yml diff --git a/roles/mgrote_docker_housekeeping/defaults/main.yml b/roles/mgrote_docker_housekeeping/defaults/main.yml new file mode 100644 index 00000000..71d52afc --- /dev/null +++ b/roles/mgrote_docker_housekeeping/defaults/main.yml @@ -0,0 +1,3 @@ +--- +docker_housekeeping_schedule: +... diff --git a/roles/mgrote_docker_housekeeping/handlers/main.yml b/roles/mgrote_docker_housekeeping/handlers/main.yml index 7a0fa1e2..bcd37069 100644 --- a/roles/mgrote_docker_housekeeping/handlers/main.yml +++ b/roles/mgrote_docker_housekeeping/handlers/main.yml @@ -11,18 +11,13 @@ enabled: true masked: false with_items: - - media-docker_housekeeping.automount - - media-docker_housekeeping.mount - docker_housekeeping.service - docker_housekeeping.timer - - docker_housekeeping_mail.service - name: systemctl start units become: true ansible.builtin.systemd: - name: "{{ item }}" + name: docker_housekeeping.timer state: restarted enabled: true - with_items: - - docker_housekeeping.timer notify: systemctl daemon-reload diff --git a/roles/mgrote_docker_housekeeping/tasks/main.yml b/roles/mgrote_docker_housekeeping/tasks/main.yml index e5828573..6111ced7 100644 --- a/roles/mgrote_docker_housekeeping/tasks/main.yml +++ b/roles/mgrote_docker_housekeeping/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: template docker_housekeeping.service +- name: Setup docker housekeeping tasks become: true ansible.builtin.template: src: docker_housekeeping.service.j2 @@ -10,7 +10,7 @@ notify: - systemctl daemon-reload -- name: template docker_housekeeping.timer +- name: Setup timer become: true ansible.builtin.template: src: docker_housekeeping.timer.j2 diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 index 0f808bb7..16aa32a3 100644 --- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 +++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 @@ -1,15 +1,7 @@ {{ file_header | default () }} [Unit] -Description=Backup with docker_housekeeping -Requires=media-docker_housekeeping.mount -After=media-docker_housekeeping.mount -OnFailure=docker_housekeeping_mail.service +Description=Docker housekeeping tasks [Service] Type=simple -EnvironmentFile={{ docker_housekeeping_conf_dir }}/docker_housekeeping.env -ExecStart=/usr/bin/docker_housekeeping backup --one-file-system --no-cache --exclude-file {{ docker_housekeeping_conf_dir }}/excludes {{ docker_housekeeping_folders_to_backup }} -{# -iexclude-file Same as exclude-file but ignores cases like in --iexclude; https://docker_housekeeping.readthedocs.io/en/latest/040_backup.html #} -User={{ docker_housekeeping_user }} -Group={{ docker_housekeeping_group }} -RestartSec={{ docker_housekeeping_failure_delay }} +ExecStart=/usr/bin/docker system prune --force