From 612dcfc7328b2107dd66212b6d964f522c792b0a Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Tue, 4 Mar 2025 17:28:33 -0500
Subject: [PATCH] Updates for better usability

---
 .../rear_backup/tasks/archive_backup_log.yml  |  8 ++++++-
 roles/rear_backup_check/tasks/main.yml        | 22 +++++--------------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/roles/rear_backup/tasks/archive_backup_log.yml b/roles/rear_backup/tasks/archive_backup_log.yml
index 339a0e8..7766f7d 100644
--- a/roles/rear_backup/tasks/archive_backup_log.yml
+++ b/roles/rear_backup/tasks/archive_backup_log.yml
@@ -8,7 +8,13 @@
   when:
     - rear_backup_log_stat['stat']['exists']
   block:
-    - name: Copy ReaR log file to backup location
+    - name: Validate ReaR backup completion
+      ansible.builtin.command:
+        cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log"
+      register: rear_backup_validate
+      failed_when: rear_backup_validate['rc'] not in [0]
+
+    - name: Backup ReaR log file
       ansible.builtin.copy:
         src: "/var/log/rear/rear-{{ ansible_hostname }}.log"
         dest: "/var/log/rear-{{ ansible_hostname }}-{{ '%Y-%m-%d' | strftime(rear_backup_log_stat['stat']['mtime']) }}.log"
diff --git a/roles/rear_backup_check/tasks/main.yml b/roles/rear_backup_check/tasks/main.yml
index e818458..f7b8ea3 100644
--- a/roles/rear_backup_check/tasks/main.yml
+++ b/roles/rear_backup_check/tasks/main.yml
@@ -1,21 +1,11 @@
 ---
-- name: Check for backup log presence
+- name: Check for previous backup completion
   ansible.builtin.stat:
-    path: "/var/log/rear/rear-{{ ansible_hostname }}.log"
-  register: rear_backup_log_presence
+    path: "{{ rear_backup_success_file_path }}/{{ rear_backup_workflow }}_rear_success"
+  register: rear_backup_success_file
 
-- name: End host if ReaR backup already exists
+- name: End if backup has already completed successfully
+  ansible.builtin.meta: end_host
   when:
-    - rear_backup_log_presence['stat']['exists'] | bool
+    - rear_backup_success_file['stat']['exists'] | bool
     - not rear_force_backup | default(false) | bool
-  block:
-    - name: Validate ReaR backup completion
-      ansible.builtin.command:
-        cmd: "grep 'Finished running mkbackup workflow' /var/log/rear/rear-{{ ansible_hostname }}.log"
-      register: validate_backup_log
-      failed_when: validate_backup_log['rc'] not in [0,1]
-
-    - name: End play if ReaR already exists
-      ansible.builtin.meta: end_host
-      when:
-        - validate_backup_log['rc'] == 0