From da8fda85555c6a394a526981d195e76741ccb20a Mon Sep 17 00:00:00 2001
From: Chris Hammer <chris@thezengarden.net>
Date: Fri, 28 Feb 2025 01:11:39 -0500
Subject: [PATCH] Updates, renames, etc.

---
 bigboot_rear_backup.yml                            | 14 ++------------
 .../backup_rear_log.yml                            | 12 ++++++------
 2 files changed, 8 insertions(+), 18 deletions(-)
 rename bigboot_backup_rear_log.yml => tasks/backup_rear_log.yml (64%)

diff --git a/bigboot_rear_backup.yml b/bigboot_rear_backup.yml
index 05d08a8..365508e 100644
--- a/bigboot_rear_backup.yml
+++ b/bigboot_rear_backup.yml
@@ -35,18 +35,8 @@
           vars:
             rear_nfs_export_share: "{{ bigboot_nfs_backup_share }}"
 
-        - name: Copy ReaR log file to backup location
-          ansible.builtin.copy:
-            src: "/var/log/rear/rear-{{ ansible_hostname }}.log"
-            dest: "/var/log/rear-{{ ansible_hostname }}-{{ '%Y-%m-%d' | strftime(old_rear_log['stat']['mtime']) }}.log"
-            mode: "0644"
-            backup: true
-            remote_src: true
-
-        - name: Remove ReaR log file
-          ansible.builtin.file:
-            path: "/var/log/rear/rear-{{ ansible_hostname }}.log"
-            state: absent
+        - name: Check and archive ReaR backup log file
+          ansible.builtin.import_tasks: tasks/backup_rear_log.yml
 
         - name: Create success file directory if not present
           ansible.builtin.file:
diff --git a/bigboot_backup_rear_log.yml b/tasks/backup_rear_log.yml
similarity index 64%
rename from bigboot_backup_rear_log.yml
rename to tasks/backup_rear_log.yml
index 4675b7b..8c31f54 100644
--- a/bigboot_backup_rear_log.yml
+++ b/tasks/backup_rear_log.yml
@@ -1,22 +1,22 @@
 ---
-- name: Check previous log file
+- name: Check for ReaR backup log file presence
   ansible.builtin.stat:
     path: "/var/log/rear/rear-{{ ansible_hostname }}.log"
-  register: old_rear_log
+  register: bigboot_rear_log
 
 - name: Backup ReaR log file
   when:
-    - old_rear_log['stat']['exists']
+    - bigboot_rear_log['stat']['exists']
   block:
-    - name: Copy old ReaR log file to backup location
+    - name: Copy ReaR log file to backup location
       ansible.builtin.copy:
         src: "/var/log/rear/rear-{{ ansible_hostname }}.log"
-        dest: "/var/log/rear-{{ ansible_hostname }}-{{ '%Y-%m-%d' | strftime(old_rear_log['stat']['mtime']) }}.log"
+        dest: "/var/log/rear-{{ ansible_hostname }}-{{ '%Y-%m-%d' | strftime(bigboot_rear_log['stat']['mtime']) }}.log"
         mode: "0644"
         backup: true
         remote_src: true
 
-    - name: Remove old ReaR log file
+    - name: Remove ReaR log file
       ansible.builtin.file:
         path: "/var/log/rear/rear-{{ ansible_hostname }}.log"
         state: absent