From 8e27769f5bc4f2440ce7a845a665f6ec154b43f6 Mon Sep 17 00:00:00 2001
From: uumas <gitcommit@uumas.fi>
Date: Mon, 31 Mar 2025 03:50:21 +0300
Subject: [PATCH] borgmatic: check mode fixes

---
 roles/borgmatic/tasks/main.yaml           | 2 ++
 roles/borgmatic/tasks/target.yaml         | 1 +
 roles/borgmatic_config/handlers/main.yaml | 1 +
 roles/borgmatic_config/tasks/main.yaml    | 2 +-
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/roles/borgmatic/tasks/main.yaml b/roles/borgmatic/tasks/main.yaml
index 1839fc4..6152c70 100644
--- a/roles/borgmatic/tasks/main.yaml
+++ b/roles/borgmatic/tasks/main.yaml
@@ -12,12 +12,14 @@
 - name: Install borgmatic
   ansible.builtin.apt:
     name: borgmatic
+  register: _borgmatic_install
 
 - name: Disable borgmatic global timer
   ansible.builtin.systemd_service:
     name: borgmatic.timer
     state: stopped
     enabled: false
+  when: "not (ansible_check_mode and _borgmatic_install.changed)"
 
 - name: Add systemd drop-in service for borgmatic
   ansible.builtin.template:
diff --git a/roles/borgmatic/tasks/target.yaml b/roles/borgmatic/tasks/target.yaml
index 39f6f7a..4f33a5a 100644
--- a/roles/borgmatic/tasks/target.yaml
+++ b/roles/borgmatic/tasks/target.yaml
@@ -2,6 +2,7 @@
 - name: Gather facts
   ansible.builtin.setup:
   delegate_facts: true
+  retries: 3
 
 - name: Add ssh key to authorized_keys
   ansible.posix.authorized_key:
diff --git a/roles/borgmatic_config/handlers/main.yaml b/roles/borgmatic_config/handlers/main.yaml
index 3255006..942d4cc 100644
--- a/roles/borgmatic_config/handlers/main.yaml
+++ b/roles/borgmatic_config/handlers/main.yaml
@@ -4,3 +4,4 @@
     name: "borgmatic@{{ borgmatic_config_name }}.timer"
     state: restarted
     daemon_reload: true
+  ignore_errors: "{{ ansible_check_mode }}"
diff --git a/roles/borgmatic_config/tasks/main.yaml b/roles/borgmatic_config/tasks/main.yaml
index 23daab9..8a81003 100644
--- a/roles/borgmatic_config/tasks/main.yaml
+++ b/roles/borgmatic_config/tasks/main.yaml
@@ -32,4 +32,4 @@
     name: borgmatic@{{ borgmatic_config_name }}.timer
     state: started
     enabled: true
-  when: "not (ansible_check_mode and _borgmatic_config_systemd_timer.changed and _borgmatic_config_systemd_timer.diff.before == '')"
+  when: "not (ansible_check_mode and _borgmatic_config_systemd_timer.changed)"