From 92acf1b0c12691c53655204291983317a19781b4 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Fri, 30 Aug 2024 14:50:03 +0200 Subject: [PATCH] Fix backup hostname in forget --- roles/backup/templates/backup.sh.j2 | 4 ++-- roles/watchtower/vars/main.yml | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/roles/backup/templates/backup.sh.j2 b/roles/backup/templates/backup.sh.j2 index acff84b..cdfff87 100755 --- a/roles/backup/templates/backup.sh.j2 +++ b/roles/backup/templates/backup.sh.j2 @@ -59,8 +59,8 @@ _success rm -rf "$BACKUP_LOCATION" -echo "forgetting old backups for $(hostname)" -docker compose run --rm app forget --host "$(hostname)" --prune \ +echo "forgetting old backups for {{ ansible_facts.hostname }}" +docker compose run --rm app forget --host "{{ ansible_facts.hostname }}" --prune \ --keep-last 7 \ --keep-daily 14 \ --keep-weekly 16 \ diff --git a/roles/watchtower/vars/main.yml b/roles/watchtower/vars/main.yml index b5ec68c..94aa577 100644 --- a/roles/watchtower/vars/main.yml +++ b/roles/watchtower/vars/main.yml @@ -7,6 +7,9 @@ watchtower_env: WATCHTOWER_CLEANUP: true WATCHTOWER_SCHEDULE: "0 27 20 * * *" + # use to disable watchtower + # WATCHTOWER_NO_PULL: true + WATCHTOWER_NOTIFICATIONS: email WATCHTOWER_NOTIFICATION_EMAIL_FROM: "{{ svc.name }}@serguzim.me" WATCHTOWER_NOTIFICATION_EMAIL_TO: "{{ admin_email }}"